|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
|
|
yann@1
|
3 |
In file included from dynamic-link.h:22,
|
|
yann@1
|
4 |
from dl-reloc.c:265:
|
|
yann@1
|
5 |
../sysdeps/i386/dl-machine.h: In function '_dl_relocate_object':
|
|
yann@1
|
6 |
../sysdeps/i386/dl-machine.h:395: error: invalid storage class for function 'elf_machine_rel'
|
|
yann@1
|
7 |
../sysdeps/i386/dl-machine.h:539: error: invalid storage class for function 'elf_machine_rela'
|
|
yann@1
|
8 |
../sysdeps/i386/dl-machine.h:640: error: invalid storage class for function 'elf_machine_rel_relative'
|
|
yann@1
|
9 |
../sysdeps/i386/dl-machine.h:650: error: invalid storage class for function 'elf_machine_rela_relative'
|
|
yann@1
|
10 |
../sysdeps/i386/dl-machine.h:659: error: invalid storage class for function 'elf_machine_lazy_rel'
|
|
yann@1
|
11 |
../sysdeps/i386/dl-machine.h:680: error: invalid storage class for function 'elf_machine_lazy_rela'
|
|
yann@1
|
12 |
make[2]: *** [/home/dank/queue/jobdir.dual2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.3/build-glibc/elf/dl-reloc.o] Error 1
|
|
yann@1
|
13 |
|
|
yann@1
|
14 |
--- glibc-2.3.3/sysdeps/i386/dl-machine.h.old Wed Mar 16 22:24:09 2005
|
|
yann@1
|
15 |
+++ glibc-2.3.3/sysdeps/i386/dl-machine.h Thu Mar 17 01:30:09 2005
|
|
yann@1
|
16 |
@@ -385,7 +385,14 @@
|
|
yann@1
|
17 |
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
yann@1
|
18 |
MAP is the object containing the reloc. */
|
|
yann@1
|
19 |
|
|
yann@1
|
20 |
-static inline void
|
|
yann@1
|
21 |
+#if __GNUC__ >= 4
|
|
yann@1
|
22 |
+ auto inline void
|
|
yann@1
|
23 |
+#else
|
|
yann@1
|
24 |
+ static inline void
|
|
yann@1
|
25 |
+#endif
|
|
yann@1
|
26 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
27 |
+ __attribute ((always_inline))
|
|
yann@1
|
28 |
+#endif
|
|
yann@1
|
29 |
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
yann@1
|
30 |
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
yann@1
|
31 |
void *const reloc_addr_arg)
|
|
yann@1
|
32 |
@@ -529,7 +536,14 @@
|
|
yann@1
|
33 |
}
|
|
yann@1
|
34 |
|
|
yann@1
|
35 |
#ifndef RTLD_BOOTSTRAP
|
|
yann@1
|
36 |
-static inline void
|
|
yann@1
|
37 |
+#if __GNUC__ >= 4
|
|
yann@1
|
38 |
+ auto inline void
|
|
yann@1
|
39 |
+#else
|
|
yann@1
|
40 |
+ static inline void
|
|
yann@1
|
41 |
+#endif
|
|
yann@1
|
42 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
43 |
+ __attribute ((always_inline))
|
|
yann@1
|
44 |
+#endif
|
|
yann@1
|
45 |
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|
yann@1
|
46 |
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
yann@1
|
47 |
void *const reloc_addr_arg)
|
|
yann@1
|
48 |
@@ -631,7 +645,14 @@
|
|
yann@1
|
49 |
}
|
|
yann@1
|
50 |
#endif /* !RTLD_BOOTSTRAP */
|
|
yann@1
|
51 |
|
|
yann@1
|
52 |
-static inline void
|
|
yann@1
|
53 |
+#if __GNUC__ >= 4
|
|
yann@1
|
54 |
+ auto inline void
|
|
yann@1
|
55 |
+#else
|
|
yann@1
|
56 |
+ static inline void
|
|
yann@1
|
57 |
+#endif
|
|
yann@1
|
58 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
59 |
+ __attribute ((always_inline))
|
|
yann@1
|
60 |
+#endif
|
|
yann@1
|
61 |
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
yann@1
|
62 |
void *const reloc_addr_arg)
|
|
yann@1
|
63 |
{
|
|
yann@1
|
64 |
@@ -641,7 +662,14 @@
|
|
yann@1
|
65 |
}
|
|
yann@1
|
66 |
|
|
yann@1
|
67 |
#ifndef RTLD_BOOTSTRAP
|
|
yann@1
|
68 |
-static inline void
|
|
yann@1
|
69 |
+#if __GNUC__ >= 4
|
|
yann@1
|
70 |
+ auto inline void
|
|
yann@1
|
71 |
+#else
|
|
yann@1
|
72 |
+ static inline void
|
|
yann@1
|
73 |
+#endif
|
|
yann@1
|
74 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
75 |
+ __attribute ((always_inline))
|
|
yann@1
|
76 |
+#endif
|
|
yann@1
|
77 |
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
|
yann@1
|
78 |
void *const reloc_addr_arg)
|
|
yann@1
|
79 |
{
|
|
yann@1
|
80 |
@@ -650,7 +678,14 @@
|
|
yann@1
|
81 |
}
|
|
yann@1
|
82 |
#endif /* !RTLD_BOOTSTRAP */
|
|
yann@1
|
83 |
|
|
yann@1
|
84 |
-static inline void
|
|
yann@1
|
85 |
+#if __GNUC__ >= 4
|
|
yann@1
|
86 |
+ auto inline void
|
|
yann@1
|
87 |
+#else
|
|
yann@1
|
88 |
+ static inline void
|
|
yann@1
|
89 |
+#endif
|
|
yann@1
|
90 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
91 |
+ __attribute ((always_inline))
|
|
yann@1
|
92 |
+#endif
|
|
yann@1
|
93 |
elf_machine_lazy_rel (struct link_map *map,
|
|
yann@1
|
94 |
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
|
yann@1
|
95 |
{
|
|
yann@1
|
96 |
@@ -671,7 +706,14 @@
|
|
yann@1
|
97 |
|
|
yann@1
|
98 |
#ifndef RTLD_BOOTSTRAP
|
|
yann@1
|
99 |
|
|
yann@1
|
100 |
-static inline void
|
|
yann@1
|
101 |
+#if __GNUC__ >= 4
|
|
yann@1
|
102 |
+ auto inline void
|
|
yann@1
|
103 |
+#else
|
|
yann@1
|
104 |
+ static inline void
|
|
yann@1
|
105 |
+#endif
|
|
yann@1
|
106 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
107 |
+ __attribute ((always_inline))
|
|
yann@1
|
108 |
+#endif
|
|
yann@1
|
109 |
elf_machine_lazy_rela (struct link_map *map,
|
|
yann@1
|
110 |
Elf32_Addr l_addr, const Elf32_Rela *reloc)
|
|
yann@1
|
111 |
{
|