Fix dummy main reference so it works...

4 files changed, 24 insertions, 13 deletions

diff --git a/libc/sysdeps/linux/i386/crt0.c b/libc/sysdeps/linux/i386/crt0.c
index 8e55e5895..3fe00ec04 100644
--- a/libc/sysdeps/linux/i386/crt0.c
+++ b/libc/sysdeps/linux/i386/crt0.c
@@ -19,8 +19,13 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-extern void __uClibc_main(int argc,void *argv,void *envp);
+/* Stick in a dummy reference to main(), so that if an application
+ * is linking when the main() function is in a static library (.a)
+ * we can be sure that main() actually gets linked in */
+extern void main(int argc,void *argv,void *envp);
+void (*mainp)(int argc,void *argv,void *envp) = main;
 
+extern void __uClibc_main(int argc,void *argv,void *envp);
 
 void _start(unsigned int first_arg)
 {
@@ -32,7 +37,6 @@ void _start(unsigned int first_arg)
 	argc = *(stack - 1);
 	argv = (char **) stack;
 	envp = (char **)stack + argc + 1;
-	volatile void (*mainp)(int argc,void *argv,void *envp) = main;
 
 	__uClibc_main(argc, argv, envp);
 }
diff --git a/libc/sysdeps/linux/m68k/crt0.c b/libc/sysdeps/linux/m68k/crt0.c
index 791b7349b..74601ec75 100644
--- a/libc/sysdeps/linux/m68k/crt0.c
+++ b/libc/sysdeps/linux/m68k/crt0.c
@@ -19,8 +19,13 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-extern void __uClibc_main(int argc,void *argv,void *envp);
+/* Stick in a dummy reference to main(), so that if an application
+ * is linking when the main() function is in a static library (.a)
+ * we can be sure that main() actually gets linked in */
+extern void main(int argc,void *argv,void *envp);
+void (*mainp)(int argc,void *argv,void *envp) = main;
 
+extern void __uClibc_main(int argc,void *argv,void *envp);
 
 void _start(unsigned int first_arg)
 {
@@ -32,7 +37,6 @@ void _start(unsigned int first_arg)
 	argc = *(stack - 1);
 	argv = (char **) stack;
 	envp = (char **)stack + argc + 1;
-	volatile void (*mainp)(int argc,void *argv,void *envp) = main;
 
 	__uClibc_main(argc, argv, envp);
 }
diff --git a/libc/sysdeps/linux/powerpc/crt0.c b/libc/sysdeps/linux/powerpc/crt0.c
index f577a5ae1..cef53bb4a 100644
--- a/libc/sysdeps/linux/powerpc/crt0.c
+++ b/libc/sysdeps/linux/powerpc/crt0.c
@@ -37,6 +37,12 @@ asm(
 	");
 
 
+/* Stick in a dummy reference to main(), so that if an application
+ * is linking when the main() function is in a static library (.a)
+ * we can be sure that main() actually gets linked in */
+extern void main(int argc,void *argv,void *envp);
+void (*mainp)(int argc,void *argv,void *envp) = main;
+
 void __uClibc_main(int argc,void *argv,void *envp);
 
 void _start2(void)
@@ -53,10 +59,6 @@ void _start2(void)
 		p=((void *)p)+0x10;
 		argc=*(int *)p;
 	}
-	/* Stick in a dummy reference to main(), so that if an application
-	 * is linking when the main() function is in a static library (.a)
-	 * we can be sure that main() actually gets linked in */
-	volatile void (*mainp)(int argc,void *argv,void *envp) = main;
 
 	__uClibc_main(argc,p+1,p+2+argc);
 }
diff --git a/libc/sysdeps/linux/sparc/crt0.c b/libc/sysdeps/linux/sparc/crt0.c
index 323397b6f..8272f3dde 100644
--- a/libc/sysdeps/linux/sparc/crt0.c
+++ b/libc/sysdeps/linux/sparc/crt0.c
@@ -19,6 +19,12 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+/* Stick in a dummy reference to main(), so that if an application
+ * is linking when the main() function is in a static library (.a)
+ * we can be sure that main() actually gets linked in */
+extern void main(int argc,void *argv,void *envp);
+void (*mainp)(int argc,void *argv,void *envp) = main;
+
 extern void __uClibc_main(int argc,void *argv,void *envp);
 
 
@@ -32,11 +38,6 @@ void _start(unsigned int first_arg)
 	argc = *(stack - 1);
 	argv = (char **) stack;
 	envp = (char **)stack + argc + 1;
-	
-	/* Stick in a dummy reference to main(), so that if an application
-	 * is linking when the main() function is in a static library (.a)
-	 * we can be sure that main() actually gets linked in */
-	volatile void (*mainp)(int argc,void *argv,void *envp) = main;
 
 	__uClibc_main(argc, argv, envp);
 }