|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
dl-runtime.c:56: error: conflicting types for 'fixup'
|
|
yann@1
|
3 |
../sysdeps/i386/dl-machine.h:158: error: previous declaration of 'fixup' was here
|
|
yann@1
|
4 |
when building with gcc-3.4.0
|
|
yann@1
|
5 |
|
|
yann@1
|
6 |
First hunk:
|
|
yann@1
|
7 |
Define ARCH_FIXUP_ATTRIBUTE and use it in the fixup function declarations.
|
|
yann@1
|
8 |
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
|
9 |
[rediffed against glibc-2.2.5]
|
|
yann@1
|
10 |
|
|
yann@1
|
11 |
Second hunk:
|
|
yann@1
|
12 |
If ARCH_FIXUP_ATTRIBUTE is not defined, provide dummy definition.
|
|
yann@1
|
13 |
Use macro in fixup function definitions.
|
|
yann@1
|
14 |
http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/elf/dl-runtime.c.diff?r1=1.64&r2=1.65&cvsroot=glibc
|
|
yann@1
|
15 |
[rediffed against glibc-2.3.2]
|
|
yann@1
|
16 |
|
|
yann@1
|
17 |
===================================================================
|
|
yann@1
|
18 |
--- glibc-2.2.5/sysdeps/i386/dl-machine.h.old Sun Apr 11 11:53:23 2004
|
|
yann@1
|
19 |
+++ glibc-2.2.5/sysdeps/i386/dl-machine.h Sun Apr 11 11:55:38 2004
|
|
yann@1
|
20 |
@@ -63,11 +63,12 @@
|
|
yann@1
|
21 |
destroys the passed register information. */
|
|
yann@1
|
22 |
/* GKM FIXME: Fix trampoline to pass bounds so we can do
|
|
yann@1
|
23 |
without the `__unbounded' qualifier. */
|
|
yann@1
|
24 |
+#define ARCH_FIXUP_ATTRIBUTE __attribute__ ((regparm (3), unused))
|
|
yann@1
|
25 |
static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
|
|
yann@1
|
26 |
- __attribute__ ((regparm (2), unused));
|
|
yann@1
|
27 |
+ ARCH_FIXUP_ATTRIBUTE;
|
|
yann@1
|
28 |
static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
|
|
yann@1
|
29 |
ElfW(Addr) retaddr)
|
|
yann@1
|
30 |
- __attribute__ ((regparm (3), unused));
|
|
yann@1
|
31 |
+ ARCH_FIXUP_ATTRIBUTE;
|
|
yann@1
|
32 |
#endif
|
|
yann@1
|
33 |
|
|
yann@1
|
34 |
/* Set up the loaded object described by L so its unrelocated PLT
|
|
yann@1
|
35 |
===================================================================
|
|
yann@1
|
36 |
--- /home/dank/downloads/glibc-2.3.2/elf/dl-runtime.c Fri Feb 7 11:41:12 2003
|
|
yann@1
|
37 |
+++ glibc-2.3.2/elf/dl-runtime.c Thu Apr 8 22:24:26 2004
|
|
yann@1
|
38 |
@@ -36,6 +36,12 @@
|
|
yann@1
|
39 |
# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
|
|
yann@1
|
40 |
#endif
|
|
yann@1
|
41 |
|
|
yann@1
|
42 |
+/* The fixup functions might have need special attributes. If none
|
|
yann@1
|
43 |
+ are provided define the macro as empty. */
|
|
yann@1
|
44 |
+#ifndef ARCH_FIXUP_ATTRIBUTE
|
|
yann@1
|
45 |
+# define ARCH_FIXUP_ATTRIBUTE
|
|
yann@1
|
46 |
+#endif
|
|
yann@1
|
47 |
+
|
|
yann@1
|
48 |
|
|
yann@1
|
49 |
/* This function is called through a special trampoline from the PLT the
|
|
yann@1
|
50 |
first time each PLT entry is called. We must perform the relocation
|
|
yann@1
|
51 |
@@ -45,7 +51,7 @@
|
|
yann@1
|
52 |
function. */
|
|
yann@1
|
53 |
|
|
yann@1
|
54 |
#ifndef ELF_MACHINE_NO_PLT
|
|
yann@1
|
55 |
-static ElfW(Addr) __attribute_used__
|
|
yann@1
|
56 |
+static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE
|
|
yann@1
|
57 |
fixup (
|
|
yann@1
|
58 |
# ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
|
yann@1
|
59 |
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
|
yann@1
|
60 |
@@ -132,7 +138,7 @@
|
|
yann@1
|
61 |
|
|
yann@1
|
62 |
#if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
|
|
yann@1
|
63 |
|
|
yann@1
|
64 |
-static ElfW(Addr) __attribute_used__
|
|
yann@1
|
65 |
+static ElfW(Addr) __attribute_used__ ARCH_FIXUP_ATTRIBUTE
|
|
yann@1
|
66 |
profile_fixup (
|
|
yann@1
|
67 |
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
|
yann@1
|
68 |
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|