Cope with gcc 3.4's more aggressive persuit of attribute unused

10 files changed, 20 insertions, 22 deletions

diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
index d4a1ee79b..97e6fc75b 100644
--- a/ldso/ldso/arm/dl-startup.h
+++ b/ldso/ldso/arm/dl-startup.h
@@ -20,7 +20,7 @@ asm(""						\
 "	mov	pc, r6\n"			\
 );
 
-#define DL_BOOT(X)   static __attribute__ ((unused)) void* _dl_boot2 (X)
+#define DL_BOOT(X)   static __attribute_used__ void* _dl_boot2 (X)
 
 
 /* Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/cris/dl-startup.h b/ldso/ldso/cris/dl-startup.h
index e910c235c..cf8fd353a 100644
--- a/ldso/ldso/cris/dl-startup.h
+++ b/ldso/ldso/cris/dl-startup.h
@@ -15,7 +15,7 @@ asm(""					\
 "	jsr $r9\n"			\
 );
 
-#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2 (X)
+#define DL_BOOT(X) static void __attribute_used__ _dl_boot2 (X)
 
 
 /* Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c
index 270a5a60e..227ef8cad 100644
--- a/ldso/ldso/frv/elfinterp.c
+++ b/ldso/ldso/frv/elfinterp.c
@@ -2,7 +2,7 @@
    Copyright (C) 2003 Red Hat, Inc.
    Contributed by Alexandre Oliva <aoliva@redhat.com>
    Lots of code copied from ../i386/elfinterp.c, so:
-   Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald, 
+   Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald,
   				David Engel, Hongjiu Lu and Mitch D'Souza
    Copyright (C) 2001-2002, Erik Andersen
    All rights reserved.
@@ -24,9 +24,7 @@ License along with uClibc; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
 USA.  */
 
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__((__unused__))
-#endif
+#include <sys/cdefs.h>	    /* __attribute_used__ */
 
 #if defined (__SUPPORT_LD_DEBUG__)
 static const char *_dl_reltypes_tab[] =
@@ -393,9 +391,9 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
 
 static int
 _dl_do_lazy_reloc (struct elf_resolve *tpnt,
-		   struct dyn_elf *scope ATTRIBUTE_UNUSED,
-		   ELF_RELOC *rpnt, Elf32_Sym *symtab ATTRIBUTE_UNUSED,
-		   char *strtab ATTRIBUTE_UNUSED)
+		   struct dyn_elf *scope __attribute_used__,
+		   ELF_RELOC *rpnt, Elf32_Sym *symtab __attribute_used__,
+		   char *strtab __attribute_used__)
 {
 	int reloc_type;
 	struct funcdesc_value volatile *reloc_addr;
@@ -436,7 +434,7 @@ _dl_do_lazy_reloc (struct elf_resolve *tpnt,
 void
 _dl_parse_lazy_relocation_information
 (struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size,
- int type ATTRIBUTE_UNUSED)
+ int type __attribute_used__)
 {
   _dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
 }
@@ -444,7 +442,7 @@ _dl_parse_lazy_relocation_information
 int
 _dl_parse_relocation_information
 (struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size,
- int type ATTRIBUTE_UNUSED)
+ int type __attribute_used__)
 {
   /* The interpreter initial self-relocation is complete, and we
      can't re-apply relocations.  */
@@ -458,10 +456,10 @@ _dl_parse_relocation_information
 
 int
 _dl_parse_copy_information
-(struct dyn_elf *rpnt ATTRIBUTE_UNUSED,
- unsigned long rel_addr ATTRIBUTE_UNUSED,
- unsigned long rel_size ATTRIBUTE_UNUSED,
- int type ATTRIBUTE_UNUSED)
+(struct dyn_elf *rpnt __attribute_used__,
+ unsigned long rel_addr __attribute_used__,
+ unsigned long rel_size __attribute_used__,
+ int type __attribute_used__)
 {
   return 0;
 }
diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h
index d57134d19..8f5a6c0e7 100644
--- a/ldso/ldso/i386/dl-startup.h
+++ b/ldso/ldso/i386/dl-startup.h
@@ -5,7 +5,7 @@
  */
 
 /* For x86 we do not need any special setup so go right to _dl_boot() */
-#define DL_BOOT(X) __attribute__ ((unused)) void _dl_boot (X)
+#define DL_BOOT(X) __attribute_used__ void _dl_boot (X)
 
 /* Get a pointer to the argv array.  On many platforms this can be just
  * the address if the first argument, on other platforms we need to
diff --git a/ldso/ldso/m68k/dl-startup.h b/ldso/ldso/m68k/dl-startup.h
index 8c37ebf0d..3716735df 100644
--- a/ldso/ldso/m68k/dl-startup.h
+++ b/ldso/ldso/m68k/dl-startup.h
@@ -3,7 +3,7 @@
  */
 
 /* For m68k we do not need any special setup so go right to _dl_boot() */
-#define DL_BOOT(X) __attribute__ ((unused)) void _dl_boot (X)
+#define DL_BOOT(X) __attribute_used__ void _dl_boot (X)
 
 /* Get a pointer to the argv array.  On many platforms this can be just
  * the address if the first argument, on other platforms we need to
diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h
index 21c9074e1..3d9b829c3 100644
--- a/ldso/ldso/mips/dl-startup.h
+++ b/ldso/ldso/mips/dl-startup.h
@@ -34,7 +34,7 @@ asm("" \
 "	jr $25\n"			\
 );
 
-#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+#define DL_BOOT(X)   static void __attribute_used__ _dl_boot2 (X)
 
 /*
  * Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h
index b33d6c5a7..5d8073ccf 100644
--- a/ldso/ldso/powerpc/dl-startup.h
+++ b/ldso/ldso/powerpc/dl-startup.h
@@ -17,7 +17,7 @@ asm("" \
 ".previous\n"				\
 );
 
-#define DL_BOOT(X) static void __attribute__ ((unused)) _dl_boot2(X)
+#define DL_BOOT(X) static void __attribute_used__ _dl_boot2(X)
 
 /*
  * Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/sh/dl-startup.h b/ldso/ldso/sh/dl-startup.h
index 0a41e36d6..78e844a64 100644
--- a/ldso/ldso/sh/dl-startup.h
+++ b/ldso/ldso/sh/dl-startup.h
@@ -18,7 +18,7 @@ asm("" \
 "	.previous\n"			\
 );
 
-#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+#define DL_BOOT(X)   static void __attribute_used__ _dl_boot2 (X)
 
 /*
  * Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/sh64/dl-startup.h b/ldso/ldso/sh64/dl-startup.h
index 9c92e221f..6f420aa7b 100644
--- a/ldso/ldso/sh64/dl-startup.h
+++ b/ldso/ldso/sh64/dl-startup.h
@@ -21,7 +21,7 @@ asm("" \
 "	blink	tr0, r18	! call _dl_boot2 - user EP is in r2\n"	\
 );
 
-#define DL_BOOT(X)   static void __attribute__ ((unused)) _dl_boot2 (X)
+#define DL_BOOT(X)   static void __attribute_used__ _dl_boot2 (X)
 
 /*
  * Get a pointer to the argv array.  On many platforms this can be just
diff --git a/ldso/ldso/sparc/dl-startup.h b/ldso/ldso/sparc/dl-startup.h
index dd502f39c..b0d6a4361 100644
--- a/ldso/ldso/sparc/dl-startup.h
+++ b/ldso/ldso/sparc/dl-startup.h
@@ -4,7 +4,7 @@
  * can be done.
  */
 
-#define DL_BOOT(X) __attribute__ ((unused)) void _dl_boot (X)
+#define DL_BOOT(X) __attribute_used__ void _dl_boot (X)
 
 
 /*