diff options
-rw-r--r-- | ldso/ldso/arm/boot1_arch.h | 3 | ||||
-rw-r--r-- | ldso/ldso/arm/dl-startup.h | 3 | ||||
-rw-r--r-- | ldso/ldso/cris/boot1_arch.h | 1 | ||||
-rw-r--r-- | ldso/ldso/cris/dl-startup.h | 1 | ||||
-rw-r--r-- | ldso/ldso/dl-startup.c | 2 | ||||
-rw-r--r-- | ldso/ldso/i386/boot1_arch.h | 2 | ||||
-rw-r--r-- | ldso/ldso/i386/dl-startup.h | 2 | ||||
-rw-r--r-- | ldso/ldso/m68k/boot1_arch.h | 2 | ||||
-rw-r--r-- | ldso/ldso/m68k/dl-startup.h | 2 | ||||
-rw-r--r-- | ldso/ldso/mips/boot1_arch.h | 1 | ||||
-rw-r--r-- | ldso/ldso/mips/dl-startup.h | 1 | ||||
-rw-r--r-- | ldso/ldso/powerpc/boot1_arch.h | 1 | ||||
-rw-r--r-- | ldso/ldso/powerpc/dl-startup.h | 1 | ||||
-rw-r--r-- | ldso/ldso/sh/boot1_arch.h | 1 | ||||
-rw-r--r-- | ldso/ldso/sh/dl-startup.h | 1 | ||||
-rw-r--r-- | ldso/ldso/sh64/boot1_arch.h | 2 | ||||
-rw-r--r-- | ldso/ldso/sh64/dl-startup.h | 2 | ||||
-rw-r--r-- | ldso/ldso/sparc/boot1_arch.h | 2 | ||||
-rw-r--r-- | ldso/ldso/sparc/dl-startup.h | 2 | ||||
-rw-r--r-- | ldso/ldso/startup.c | 2 |
20 files changed, 22 insertions, 12 deletions
diff --git a/ldso/ldso/arm/boot1_arch.h b/ldso/ldso/arm/boot1_arch.h index 631684c95..383fe4e1f 100644 --- a/ldso/ldso/arm/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index 631684c95..383fe4e1f 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/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) diff --git a/ldso/ldso/cris/boot1_arch.h b/ldso/ldso/cris/boot1_arch.h index d51cd59d3..bf7714539 100644 --- a/ldso/ldso/cris/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/cris/dl-startup.h b/ldso/ldso/cris/dl-startup.h index d51cd59d3..bf7714539 100644 --- a/ldso/ldso/cris/dl-startup.h +++ b/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) diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index ec8b79293..0da911f8c 100644 --- a/ldso/ldso/dl-startup.c +++ b/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; diff --git a/ldso/ldso/i386/boot1_arch.h b/ldso/ldso/i386/boot1_arch.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/i386/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/i386/dl-startup.h +++ b/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) diff --git a/ldso/ldso/m68k/boot1_arch.h b/ldso/ldso/m68k/boot1_arch.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/m68k/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/m68k/dl-startup.h b/ldso/ldso/m68k/dl-startup.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/m68k/dl-startup.h +++ b/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) diff --git a/ldso/ldso/mips/boot1_arch.h b/ldso/ldso/mips/boot1_arch.h index ace21f8e1..886f8b8b8 100644 --- a/ldso/ldso/mips/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h index ace21f8e1..886f8b8b8 100644 --- a/ldso/ldso/mips/dl-startup.h +++ b/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) diff --git a/ldso/ldso/powerpc/boot1_arch.h b/ldso/ldso/powerpc/boot1_arch.h index 284207f17..70e494331 100644 --- a/ldso/ldso/powerpc/boot1_arch.h +++ b/ldso/ldso/powerpc/boot1_arch.h @@ -17,3 +17,4 @@ asm("" \ ".previous\n" \ ); +#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2(X) diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h index 284207f17..70e494331 100644 --- a/ldso/ldso/powerpc/dl-startup.h +++ b/ldso/ldso/powerpc/dl-startup.h @@ -17,3 +17,4 @@ asm("" \ ".previous\n" \ ); +#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2(X) diff --git a/ldso/ldso/sh/boot1_arch.h b/ldso/ldso/sh/boot1_arch.h index 83451bc56..d1ca6d985 100644 --- a/ldso/ldso/sh/boot1_arch.h +++ b/ldso/ldso/sh/boot1_arch.h @@ -18,3 +18,4 @@ asm("" \ " .previous\n" \ ); +#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2 (X) diff --git a/ldso/ldso/sh/dl-startup.h b/ldso/ldso/sh/dl-startup.h index 83451bc56..d1ca6d985 100644 --- a/ldso/ldso/sh/dl-startup.h +++ b/ldso/ldso/sh/dl-startup.h @@ -18,3 +18,4 @@ asm("" \ " .previous\n" \ ); +#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2 (X) diff --git a/ldso/ldso/sh64/boot1_arch.h b/ldso/ldso/sh64/boot1_arch.h index 7c4c3bc64..4c6f3c5e2 100644 --- a/ldso/ldso/sh64/boot1_arch.h +++ b/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) + diff --git a/ldso/ldso/sh64/dl-startup.h b/ldso/ldso/sh64/dl-startup.h index 7c4c3bc64..4c6f3c5e2 100644 --- a/ldso/ldso/sh64/dl-startup.h +++ b/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) + diff --git a/ldso/ldso/sparc/boot1_arch.h b/ldso/ldso/sparc/boot1_arch.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/sparc/boot1_arch.h +++ b/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) diff --git a/ldso/ldso/sparc/dl-startup.h b/ldso/ldso/sparc/dl-startup.h index bab0f8897..42c96a6f5 100644 --- a/ldso/ldso/sparc/dl-startup.h +++ b/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) diff --git a/ldso/ldso/startup.c b/ldso/ldso/startup.c index ec8b79293..0da911f8c 100644 --- a/ldso/ldso/startup.c +++ b/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; |