diff options
Diffstat (limited to 'patches/glibc-2.2.5/generic/glibc-2.2.5-allow-gcc-3.4-fixup.patch')
-rw-r--r-- | patches/glibc-2.2.5/generic/glibc-2.2.5-allow-gcc-3.4-fixup.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/patches/glibc-2.2.5/generic/glibc-2.2.5-allow-gcc-3.4-fixup.patch b/patches/glibc-2.2.5/generic/glibc-2.2.5-allow-gcc-3.4-fixup.patch new file mode 100644 index 000000000..5c46dc64d --- /dev/null +++ b/patches/glibc-2.2.5/generic/glibc-2.2.5-allow-gcc-3.4-fixup.patch @@ -0,0 +1,83 @@ +# +# Submitted: +# +# Marc Kleine-Budde <kleine-budde@gmx.de>, 2004/05/03 +# actually this patch is stolen from famous Dan Kegel's crosstool +# +# Error: +# +# glibc-2.2.5 with gcc > 3.4 +# +# dl-runtime.c:56: error: conflicting types for 'fixup' +# ../sysdeps/i386/dl-machine.h:158: error: previous declaration of 'fixup' was here +# when building with gcc-3.4.0 +# +# State: +# +# fixed in CVS +# +# Comments +# +# First hunk: +# Define ARCH_FIXUP_ATTRIBUTE and use it in the fixup function declarations. +# http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/i386/dl-machine.h.diff?r1=1.124&r2=1.125&cvsroot=glibc +# [rediffed against glibc-2.2.5] +# +# Second hunk: +# If ARCH_FIXUP_ATTRIBUTE is not defined, provide dummy definition. +# Use macro in fixup function definitions. +# http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/elf/dl-runtime.c.diff?r1=1.64&r2=1.65&cvsroot=glibc +# [rediffed against glibc-2.3.2] +# +=================================================================== +--- glibc-2.2.5/sysdeps/i386/dl-machine.h.old Sun Apr 11 11:53:23 2004 ++++ glibc-2.2.5/sysdeps/i386/dl-machine.h Sun Apr 11 11:55:38 2004 +@@ -63,11 +63,12 @@ + destroys the passed register information. */ + /* GKM FIXME: Fix trampoline to pass bounds so we can do + without the `__unbounded' qualifier. */ ++#define ARCH_FIXUP_ATTRIBUTE __attribute__ ((regparm (3), unused)) + static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset) +- __attribute__ ((regparm (2), unused)); ++ ARCH_FIXUP_ATTRIBUTE; + static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset, + ElfW(Addr) retaddr) +- __attribute__ ((regparm (3), unused)); ++ ARCH_FIXUP_ATTRIBUTE; + #endif + + /* Set up the loaded object described by L so its unrelocated PLT +=================================================================== +--- /home/dank/downloads/glibc-2.3.2/elf/dl-runtime.c Fri Feb 7 11:41:12 2003 ++++ glibc-2.3.2/elf/dl-runtime.c Thu Apr 8 22:24:26 2004 +@@ -36,6 +36,12 @@ + # define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym)) + #endif + ++/* The fixup functions might have need special attributes. If none ++ are provided define the macro as empty. */ ++#ifndef ARCH_FIXUP_ATTRIBUTE ++# define ARCH_FIXUP_ATTRIBUTE ++#endif ++ + + /* This function is called through a special trampoline from the PLT the + first time each PLT entry is called. We must perform the relocation +@@ -45,7 +51,7 @@ + function. */ + + #ifndef ELF_MACHINE_NO_PLT +-static ElfW(Addr) __attribute_used__ ++static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE + fixup ( + # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS + ELF_MACHINE_RUNTIME_FIXUP_ARGS, +@@ -132,7 +138,7 @@ + + #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__ + +-static ElfW(Addr) __attribute_used__ ++static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE + profile_fixup ( + #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS + ELF_MACHINE_RUNTIME_FIXUP_ARGS, |