1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.1.3/glibc-2.1.3-allow-gcc-3.4-fixup.patch Tue May 22 20:48:39 2007 +0000
1.3 @@ -0,0 +1,70 @@
1.4 +Fixes
1.5 +dl-runtime.c:56: error: conflicting types for 'fixup'
1.6 +../sysdeps/i386/dl-machine.h:158: error: previous declaration of 'fixup' was here
1.7 +when building with gcc-3.4.0
1.8 +
1.9 +First hunk:
1.10 +Define ARCH_FIXUP_ATTRIBUTE and use it in the fixup function declarations.
1.11 +http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-machine.h.diff?r1=1.124&r2=1.125&cvsroot=glibc
1.12 +[rediffed against glibc-2.1.3]
1.13 +
1.14 +Second hunk:
1.15 +If ARCH_FIXUP_ATTRIBUTE is not defined, provide dummy definition.
1.16 +Use macro in fixup function definitions.
1.17 +http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/elf/dl-runtime.c.diff?r1=1.64&r2=1.65&cvsroot=glibc
1.18 +[rediffed against glibc-2.3.2]
1.19 +
1.20 +===================================================================
1.21 +--- glibc-2.1.3/sysdeps/i386/dl-machine.h.old Sun Apr 11 18:58:45 2004
1.22 ++++ glibc-2.1.3/sysdeps/i386/dl-machine.h Sun Apr 11 18:59:51 2004
1.23 +@@ -70,11 +70,14 @@
1.24 +
1.25 + We cannot use this scheme for profiling because the _mcount call
1.26 + destroys the passed register information. */
1.27 ++
1.28 ++#define ARCH_FIXUP_ATTRIBUTE __attribute__ ((regparm (3), unused))
1.29 ++
1.30 + static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
1.31 +- __attribute__ ((regparm (2), unused));
1.32 ++ ARCH_FIXUP_ATTRIBUTE;
1.33 + static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
1.34 + ElfW(Addr) retaddr)
1.35 +- __attribute__ ((regparm (3), unused));
1.36 ++ ARCH_FIXUP_ATTRIBUTE;
1.37 + #endif
1.38 +
1.39 + /* Set up the loaded object described by L so its unrelocated PLT
1.40 +===================================================================
1.41 +--- glibc-2.1.3/elf/dl-runtime.c~ Thu Jul 15 11:32:41 1999
1.42 ++++ glibc-2.1.3/elf/dl-runtime.c Sun Apr 11 19:02:01 2004
1.43 +@@ -31,6 +31,12 @@
1.44 + # define VERSYMIDX(sym) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (sym))
1.45 + #endif
1.46 +
1.47 ++/* The fixup functions might have need special attributes. If none
1.48 ++ are provided define the macro as empty. */
1.49 ++#ifndef ARCH_FIXUP_ATTRIBUTE
1.50 ++# define ARCH_FIXUP_ATTRIBUTE
1.51 ++#endif
1.52 ++
1.53 +
1.54 + /* This function is called through a special trampoline from the PLT the
1.55 + first time each PLT entry is called. We must perform the relocation
1.56 +@@ -40,7 +46,7 @@
1.57 + function. */
1.58 +
1.59 + #ifndef ELF_MACHINE_NO_PLT
1.60 +-static ElfW(Addr) __attribute__ ((unused))
1.61 ++static ElfW(Addr) __attribute__ ((unused)) ARCH_FIXUP_ATTRIBUTE
1.62 + fixup (
1.63 + # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
1.64 + ELF_MACHINE_RUNTIME_FIXUP_ARGS,
1.65 +@@ -105,7 +111,7 @@
1.66 +
1.67 + #if !defined PROF && !defined ELF_MACHINE_NO_PLT
1.68 +
1.69 +-static ElfW(Addr) __attribute__ ((unused))
1.70 ++static ElfW(Addr) __attribute__ ((unused)) ARCH_FIXUP_ATTRIBUTE
1.71 + profile_fixup (
1.72 + #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
1.73 + ELF_MACHINE_RUNTIME_FIXUP_ARGS,