|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
In file included from dynamic-link.h:22,
|
|
yann@1
|
3 |
from dl-reloc.c:265:
|
|
yann@1
|
4 |
../sysdeps/arm/dl-machine.h: In function '_dl_relocate_object':
|
|
yann@1
|
5 |
../sysdeps/arm/dl-machine.h:371: error: invalid storage class for function 'fix_bad_pc24'
|
|
yann@1
|
6 |
../sysdeps/arm/dl-machine.h:406: error: invalid storage class for function 'elf_machine_rel'
|
|
yann@1
|
7 |
../sysdeps/arm/dl-machine.h:532: error: invalid storage class for function 'elf_machine_rela'
|
|
yann@1
|
8 |
../sysdeps/arm/dl-machine.h:612: error: invalid storage class for function 'elf_machine_rel_relative'
|
|
yann@1
|
9 |
../sysdeps/arm/dl-machine.h:621: error: invalid storage class for function 'elf_machine_rela_relative'
|
|
yann@1
|
10 |
../sysdeps/arm/dl-machine.h:630: error: invalid storage class for function 'elf_machine_lazy_rel'
|
|
yann@1
|
11 |
make[2]: Leaving directory `/home/dank/queue/jobdir.k8/crosstool-dev/build/arm-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.3/glibc-2.3.3/elf'
|
|
yann@1
|
12 |
|
|
yann@1
|
13 |
when building glibc-2.3.[34] with gcc-4.0
|
|
yann@1
|
14 |
|
|
yann@1
|
15 |
Like
|
|
yann@1
|
16 |
http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/arm/dl-machine.h.diff?r1=1.51&r2=1.52&cvsroot=glibc
|
|
yann@1
|
17 |
but works with older compilers, and fixes fix_bad_pc24.
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
|
|
yann@1
|
20 |
--- glibc-2.3.4/sysdeps/arm/dl-machine.h.old Sun Mar 20 17:54:37 2005
|
|
yann@1
|
21 |
+++ glibc-2.3.4/sysdeps/arm/dl-machine.h Sun Mar 20 17:57:32 2005
|
|
yann@1
|
22 |
@@ -359,7 +359,14 @@
|
|
yann@1
|
23 |
# endif
|
|
yann@1
|
24 |
|
|
yann@1
|
25 |
/* Deal with an out-of-range PC24 reloc. */
|
|
yann@1
|
26 |
-static Elf32_Addr
|
|
yann@1
|
27 |
+#if __GNUC__ >= 4
|
|
yann@1
|
28 |
+ auto inline Elf32_Addr
|
|
yann@1
|
29 |
+#else
|
|
yann@1
|
30 |
+ static inline Elf32_Addr
|
|
yann@1
|
31 |
+#endif
|
|
yann@1
|
32 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
33 |
+ __attribute ((always_inline))
|
|
yann@1
|
34 |
+#endif
|
|
yann@1
|
35 |
fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
|
|
yann@1
|
36 |
{
|
|
yann@1
|
37 |
static void *fix_page;
|
|
yann@1
|
38 |
@@ -392,7 +399,14 @@
|
|
yann@1
|
39 |
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
yann@1
|
40 |
MAP is the object containing the reloc. */
|
|
yann@1
|
41 |
|
|
yann@1
|
42 |
-static inline void
|
|
yann@1
|
43 |
+#if __GNUC__ >= 4
|
|
yann@1
|
44 |
+ auto inline void
|
|
yann@1
|
45 |
+#else
|
|
yann@1
|
46 |
+ static inline void
|
|
yann@1
|
47 |
+#endif
|
|
yann@1
|
48 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
49 |
+ __attribute ((always_inline))
|
|
yann@1
|
50 |
+#endif
|
|
yann@1
|
51 |
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
yann@1
|
52 |
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
yann@1
|
53 |
void *const reloc_addr_arg)
|
|
yann@1
|
54 |
@@ -517,7 +531,14 @@
|
|
yann@1
|
55 |
}
|
|
yann@1
|
56 |
|
|
yann@1
|
57 |
# ifndef RTLD_BOOTSTRAP
|
|
yann@1
|
58 |
-static inline void
|
|
yann@1
|
59 |
+#if __GNUC__ >= 4
|
|
yann@1
|
60 |
+ auto inline void
|
|
yann@1
|
61 |
+#else
|
|
yann@1
|
62 |
+ static inline void
|
|
yann@1
|
63 |
+#endif
|
|
yann@1
|
64 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
65 |
+ __attribute ((always_inline))
|
|
yann@1
|
66 |
+#endif
|
|
yann@1
|
67 |
elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|
yann@1
|
68 |
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
yann@1
|
69 |
void *const reloc_addr_arg)
|
|
yann@1
|
70 |
@@ -597,7 +618,14 @@
|
|
yann@1
|
71 |
}
|
|
yann@1
|
72 |
# endif
|
|
yann@1
|
73 |
|
|
yann@1
|
74 |
-static inline void
|
|
yann@1
|
75 |
+#if __GNUC__ >= 4
|
|
yann@1
|
76 |
+ auto inline void
|
|
yann@1
|
77 |
+#else
|
|
yann@1
|
78 |
+ static inline void
|
|
yann@1
|
79 |
+#endif
|
|
yann@1
|
80 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
81 |
+ __attribute ((always_inline))
|
|
yann@1
|
82 |
+#endif
|
|
yann@1
|
83 |
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
yann@1
|
84 |
void *const reloc_addr_arg)
|
|
yann@1
|
85 |
{
|
|
yann@1
|
86 |
@@ -606,7 +634,14 @@
|
|
yann@1
|
87 |
}
|
|
yann@1
|
88 |
|
|
yann@1
|
89 |
# ifndef RTLD_BOOTSTRAP
|
|
yann@1
|
90 |
-static inline void
|
|
yann@1
|
91 |
+#if __GNUC__ >= 4
|
|
yann@1
|
92 |
+ auto inline void
|
|
yann@1
|
93 |
+#else
|
|
yann@1
|
94 |
+ static inline void
|
|
yann@1
|
95 |
+#endif
|
|
yann@1
|
96 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
97 |
+ __attribute ((always_inline))
|
|
yann@1
|
98 |
+#endif
|
|
yann@1
|
99 |
elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
|
|
yann@1
|
100 |
void *const reloc_addr_arg)
|
|
yann@1
|
101 |
{
|
|
yann@1
|
102 |
@@ -615,7 +650,14 @@
|
|
yann@1
|
103 |
}
|
|
yann@1
|
104 |
# endif
|
|
yann@1
|
105 |
|
|
yann@1
|
106 |
-static inline void
|
|
yann@1
|
107 |
+#if __GNUC__ >= 4
|
|
yann@1
|
108 |
+ auto inline void
|
|
yann@1
|
109 |
+#else
|
|
yann@1
|
110 |
+ static inline void
|
|
yann@1
|
111 |
+#endif
|
|
yann@1
|
112 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
113 |
+ __attribute ((always_inline))
|
|
yann@1
|
114 |
+#endif
|
|
yann@1
|
115 |
elf_machine_lazy_rel (struct link_map *map,
|
|
yann@1
|
116 |
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
|
yann@1
|
117 |
{
|