|
yann@1
|
1 |
Fixes
|
|
yann@1
|
2 |
|
|
yann@1
|
3 |
In file included from dynamic-link.h:310,
|
|
yann@1
|
4 |
from dl-reloc.c:265:
|
|
yann@1
|
5 |
do-rel.h:56: error: invalid storage class for function 'elf_dynamic_do_rela'
|
|
yann@1
|
6 |
In file included from dl-reloc.c:265:
|
|
yann@1
|
7 |
dynamic-link.h: In function '_dl_relocate_object':
|
|
yann@1
|
8 |
dynamic-link.h:33: error: invalid storage class for function 'elf_get_dynamic_info'
|
|
yann@1
|
9 |
|
|
yann@1
|
10 |
when building glibc-2.3.3 with gcc-4.0
|
|
yann@1
|
11 |
2nd hunk is like http://sourceware.org/cgi-bin/cvsweb.cgi/libc/elf/dynamic-link.h.diff?r1=1.50&r2=1.51&cvsroot=glibc
|
|
yann@1
|
12 |
but works with older compilers, too
|
|
yann@1
|
13 |
|
|
yann@1
|
14 |
--- glibc-2.3.3/elf/do-rel.h.old 2005-03-16 13:09:37.000000000 -0800
|
|
yann@1
|
15 |
+++ glibc-2.3.3/elf/do-rel.h 2005-03-16 13:10:50.000000000 -0800
|
|
yann@1
|
16 |
@@ -49,7 +49,14 @@
|
|
yann@1
|
17 |
relocations; they should be set up to call _dl_runtime_resolve, rather
|
|
yann@1
|
18 |
than fully resolved now. */
|
|
yann@1
|
19 |
|
|
yann@1
|
20 |
-static inline void __attribute__ ((always_inline))
|
|
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_dynamic_do_rel (struct link_map *map,
|
|
yann@1
|
30 |
ElfW(Addr) reladdr, ElfW(Addr) relsize,
|
|
yann@1
|
31 |
int lazy)
|
|
yann@1
|
32 |
--- glibc-2.3.3/elf/dynamic-link.h.old 2005-03-16 13:22:35.000000000 -0800
|
|
yann@1
|
33 |
+++ glibc-2.3.3/elf/dynamic-link.h 2005-03-16 13:26:23.000000000 -0800
|
|
yann@1
|
34 |
@@ -27,8 +27,17 @@
|
|
yann@1
|
35 |
|
|
yann@1
|
36 |
|
|
yann@1
|
37 |
/* Read the dynamic section at DYN and fill in INFO with indices DT_*. */
|
|
yann@1
|
38 |
-
|
|
yann@1
|
39 |
-static inline void __attribute__ ((unused, always_inline))
|
|
yann@1
|
40 |
+#if !defined(RESOLVE) || __GNUC__ < 4
|
|
yann@1
|
41 |
+static
|
|
yann@1
|
42 |
+#else
|
|
yann@1
|
43 |
+auto
|
|
yann@1
|
44 |
+#endif
|
|
yann@1
|
45 |
+inline void
|
|
yann@1
|
46 |
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
|
|
yann@1
|
47 |
+ __attribute__ ((unused, always_inline))
|
|
yann@1
|
48 |
+#else
|
|
yann@1
|
49 |
+ __attribute__ ((unused))
|
|
yann@1
|
50 |
+#endif
|
|
yann@1
|
51 |
elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
|
|
yann@1
|
52 |
{
|
|
yann@1
|
53 |
ElfW(Dyn) *dyn = l->l_ld;
|