Browse Source

Restore the library entry point so it works. It does have
to be arch specific to work properly.

Eric Andersen 21 năm trước cách đây
mục cha
commit
fa34293971

+ 1 - 2
ldso/ldso/arm/boot1_arch.h

@@ -22,5 +22,4 @@ asm("" \
 #undef ELFMAGIC
 #define	    ELFMAGIC	ELFMAG+load_addr
 
-
-
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 2
ldso/ldso/arm/dl-startup.h

@@ -22,5 +22,4 @@ asm("" \
 #undef ELFMAGIC
 #define	    ELFMAGIC	ELFMAG+load_addr
 
-
-
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 0
ldso/ldso/cris/boot1_arch.h

@@ -13,3 +13,4 @@ asm(""					\
 "	jsr $r9\n"			\
 );
 
+#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 0
ldso/ldso/cris/dl-startup.h

@@ -13,3 +13,4 @@ asm(""					\
 "	jsr $r9\n"			\
 );
 
+#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 1
ldso/ldso/dl-startup.c

@@ -120,7 +120,7 @@ int (*_dl_elf_main) (int, char **, char **);
         NULL
 		auxvt[0...N]   Auxiliary Vector Table elements (mixed types)
 */
-void _dl_boot2(unsigned long args)
+DL_BOOT(unsigned long args)
 {
 	unsigned int argc;
 	char **argv, **envp;

+ 1 - 1
ldso/ldso/i386/boot1_arch.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 1
ldso/ldso/i386/dl-startup.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 1
ldso/ldso/m68k/boot1_arch.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 1
ldso/ldso/m68k/dl-startup.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 0
ldso/ldso/mips/boot1_arch.h

@@ -34,3 +34,4 @@ asm("" \
 "	jr $25\n"			\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 0
ldso/ldso/mips/dl-startup.h

@@ -34,3 +34,4 @@ asm("" \
 "	jr $25\n"			\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 0
ldso/ldso/powerpc/boot1_arch.h

@@ -17,3 +17,4 @@ asm("" \
 ".previous\n"				\
 );
 
+#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2(X)

+ 1 - 0
ldso/ldso/powerpc/dl-startup.h

@@ -17,3 +17,4 @@ asm("" \
 ".previous\n"				\
 );
 
+#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2(X)

+ 1 - 0
ldso/ldso/sh/boot1_arch.h

@@ -18,3 +18,4 @@ asm("" \
 "	.previous\n"			\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 1 - 0
ldso/ldso/sh/dl-startup.h

@@ -18,3 +18,4 @@ asm("" \
 "	.previous\n"			\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)

+ 2 - 0
ldso/ldso/sh64/boot1_arch.h

@@ -21,3 +21,5 @@ asm("" \
 "	blink	tr0, r18	! call _dl_boot2 - user EP is in r2\n"	\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+

+ 2 - 0
ldso/ldso/sh64/dl-startup.h

@@ -21,3 +21,5 @@ asm("" \
 "	blink	tr0, r18	! call _dl_boot2 - user EP is in r2\n"	\
 );
 
+#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+

+ 1 - 1
ldso/ldso/sparc/boot1_arch.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 1
ldso/ldso/sparc/dl-startup.h

@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define _dl_boot2 _dl_boot
+#define DL_BOOT(X) void __attribute__ ((unused)) _dl_boot (X)

+ 1 - 1
ldso/ldso/startup.c

@@ -120,7 +120,7 @@ int (*_dl_elf_main) (int, char **, char **);
         NULL
 		auxvt[0...N]   Auxiliary Vector Table elements (mixed types)
 */
-void _dl_boot2(unsigned long args)
+DL_BOOT(unsigned long args)
 {
 	unsigned int argc;
 	char **argv, **envp;