yann@1: Fixes
yann@1: dl-runtime.c:56: error: conflicting types for 'fixup'
yann@1: ../sysdeps/i386/dl-machine.h:158: error: previous declaration of 'fixup' was here
yann@1: when building with gcc-3.4.0
yann@1: 
yann@1: First hunk:
yann@1: Define ARCH_FIXUP_ATTRIBUTE and use it in the fixup function declarations.
yann@1: http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-machine.h.diff?r1=1.124&r2=1.125&cvsroot=glibc
yann@1: 
yann@1: Second hunk:
yann@1: If ARCH_FIXUP_ATTRIBUTE is not defined, provide dummy definition.
yann@1: Use macro in fixup function definitions.
yann@1: http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/elf/dl-runtime.c.diff?r1=1.64&r2=1.65&cvsroot=glibc
yann@1: [rediffed against glibc-2.3.2]
yann@1: 
yann@1: ===================================================================
yann@1: RCS file: /cvs/glibc/libc/sysdeps/i386/dl-machine.h,v
yann@1: retrieving revision 1.124
yann@1: retrieving revision 1.125
yann@1: diff -u -r1.124 -r1.125
yann@1: --- libc/sysdeps/i386/dl-machine.h	2004/03/05 10:14:49	1.124
yann@1: +++ libc/sysdeps/i386/dl-machine.h	2004/03/09 07:42:29	1.125
yann@1: @@ -154,11 +154,14 @@
yann@1:     destroys the passed register information.  */
yann@1:  /* GKM FIXME: Fix trampoline to pass bounds so we can do
yann@1:     without the `__unbounded' qualifier.  */
yann@1: -static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
yann@1: -     __attribute__ ((regparm (2), unused));
yann@1: +#define ARCH_FIXUP_ATTRIBUTE __attribute__ ((regparm (3), unused))
yann@1: +
yann@1: +static ElfW(Addr) fixup (struct link_map *__unbounded l,
yann@1: +			 ElfW(Word) reloc_offset)
yann@1: +     ARCH_FIXUP_ATTRIBUTE;
yann@1:  static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
yann@1:  				 ElfW(Addr) retaddr)
yann@1: -     __attribute__ ((regparm (3), unused));
yann@1: +     ARCH_FIXUP_ATTRIBUTE;
yann@1:  # endif
yann@1:  
yann@1:  /* This code is used in dl-runtime.c to call the `fixup' function
yann@1: ===================================================================
yann@1: --- /home/dank/downloads/glibc-2.3.2/elf/dl-runtime.c	Fri Feb  7 11:41:12 2003
yann@1: +++ glibc-2.3.2/elf/dl-runtime.c	Thu Apr  8 22:24:26 2004
yann@1: @@ -36,6 +36,12 @@
yann@1:  # define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
yann@1:  #endif
yann@1:  
yann@1: +/* The fixup functions might have need special attributes.  If none
yann@1: +   are provided define the macro as empty.  */
yann@1: +#ifndef ARCH_FIXUP_ATTRIBUTE
yann@1: +# define ARCH_FIXUP_ATTRIBUTE
yann@1: +#endif
yann@1: +
yann@1:  
yann@1:  /* This function is called through a special trampoline from the PLT the
yann@1:     first time each PLT entry is called.  We must perform the relocation
yann@1: @@ -45,7 +51,7 @@
yann@1:     function.  */
yann@1:  
yann@1:  #ifndef ELF_MACHINE_NO_PLT
yann@1: -static ElfW(Addr) __attribute_used__
yann@1: +static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE
yann@1:  fixup (
yann@1:  # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
yann@1:          ELF_MACHINE_RUNTIME_FIXUP_ARGS,
yann@1: @@ -132,7 +138,7 @@
yann@1:  
yann@1:  #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
yann@1:  
yann@1: -static ElfW(Addr) __attribute_used__
yann@1: +static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE
yann@1:  profile_fixup (
yann@1:  #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
yann@1:         ELF_MACHINE_RUNTIME_FIXUP_ARGS,