|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
../sysdeps/i386/dl-machine.h: In function '_dl_relocate_object':
|
|
yann@1
|
3 |
../sysdeps/i386/dl-machine.h:306: error: invalid storage class for function 'elf_machine_rel'
|
|
yann@1
|
4 |
../sysdeps/i386/dl-machine.h:385: error: invalid storage class for function 'elf_machine_rel_relative'
|
|
yann@1
|
5 |
../sysdeps/i386/dl-machine.h:393: error: invalid storage class for function 'elf_machine_lazy_rel'
|
|
yann@1
|
6 |
|
|
yann@1
|
7 |
when building glibc-2.2.5 with gcc-4.0.
|
|
yann@1
|
8 |
|
|
yann@1
|
9 |
--- /home/dank/downloads/glibc-2.2.5/sysdeps/i386/dl-machine.h 2001-08-30 16:09:10.000000000 -0700
|
|
yann@1
|
10 |
+++ glibc-2.2.5/sysdeps/i386/dl-machine.h 2005-03-11 14:00:22.601858328 -0800
|
|
yann@1
|
11 |
@@ -298,7 +299,12 @@
|
|
yann@1
|
12 |
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
yann@1
|
13 |
MAP is the object containing the reloc. */
|
|
yann@1
|
14 |
|
|
yann@1
|
15 |
+#if __GNUC__ >= 4
|
|
yann@1
|
16 |
+auto inline void
|
|
yann@1
|
17 |
+__attribute ((always_inline))
|
|
yann@1
|
18 |
+#else
|
|
yann@1
|
19 |
static inline void
|
|
yann@1
|
20 |
+#endif
|
|
yann@1
|
21 |
elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|
yann@1
|
22 |
const Elf32_Sym *sym, const struct r_found_version *version,
|
|
yann@1
|
23 |
Elf32_Addr *const reloc_addr)
|
|
yann@1
|
24 |
@@ -378,7 +384,12 @@
|
|
yann@1
|
25 |
}
|
|
yann@1
|
26 |
}
|
|
yann@1
|
27 |
|
|
yann@1
|
28 |
+#if __GNUC__ >= 4
|
|
yann@1
|
29 |
+auto inline void
|
|
yann@1
|
30 |
+__attribute ((always_inline))
|
|
yann@1
|
31 |
+#else
|
|
yann@1
|
32 |
static inline void
|
|
yann@1
|
33 |
+#endif
|
|
yann@1
|
34 |
elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
|
|
yann@1
|
35 |
Elf32_Addr *const reloc_addr)
|
|
yann@1
|
36 |
{
|
|
yann@1
|
37 |
@@ -386,7 +397,12 @@
|
|
yann@1
|
38 |
*reloc_addr += l_addr;
|
|
yann@1
|
39 |
}
|
|
yann@1
|
40 |
|
|
yann@1
|
41 |
+#if __GNUC__ >= 4
|
|
yann@1
|
42 |
+auto inline void
|
|
yann@1
|
43 |
+__attribute ((always_inline))
|
|
yann@1
|
44 |
+#else
|
|
yann@1
|
45 |
static inline void
|
|
yann@1
|
46 |
+#endif
|
|
yann@1
|
47 |
elf_machine_lazy_rel (struct link_map *map,
|
|
yann@1
|
48 |
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
|
yann@1
|
49 |
{
|