|
yann@98
|
1 |
From http://www.mail-archive.com/pld-cvs-commit@pld-linux.org/msg00229.html
|
|
yann@98
|
2 |
Fixes
|
|
yann@98
|
3 |
rtld.c: In function '_dl_start':
|
|
yann@98
|
4 |
dynamic-link.h:47: error: nested function 'elf_machine_rela_relative' declared but never defined
|
|
yann@98
|
5 |
dynamic-link.h:41: error: nested function 'elf_machine_rela' declared but never defined
|
|
yann@98
|
6 |
when compiling glibc-2.3.4 with gcc-4.0
|
|
yann@98
|
7 |
|
|
yann@98
|
8 |
But see also
|
|
yann@98
|
9 |
http://sources.redhat.com/ml/libc-hacker/2005-02/msg00000.html
|
|
yann@98
|
10 |
and
|
|
yann@98
|
11 |
http://sources.redhat.com/ml/libc-hacker/2005-03/msg00008.html
|
|
yann@98
|
12 |
which seem to propose less radical fixes?
|
|
yann@98
|
13 |
|
|
yann@98
|
14 |
Aha. See also http://sources.redhat.com/bugzilla/show_bug.cgi?id=721
|
|
yann@98
|
15 |
|
|
yann@98
|
16 |
--- glibc-2.3.6.orig/elf/dynamic-link.h 2005-03-12 18:12:37.000000000 -0800
|
|
yann@98
|
17 |
+++ glibc-2.3.6/elf/dynamic-link.h 2005-03-12 18:12:59.777820848 -0800
|
|
yann@98
|
18 |
@@ -19,47 +19,6 @@
|
|
yann@98
|
19 |
|
|
yann@98
|
20 |
#include <elf.h>
|
|
yann@98
|
21 |
#include <assert.h>
|
|
yann@98
|
22 |
-
|
|
yann@98
|
23 |
-#ifdef RESOLVE_MAP
|
|
yann@98
|
24 |
-/* We pass reloc_addr as a pointer to void, as opposed to a pointer to
|
|
yann@98
|
25 |
- ElfW(Addr), because not all architectures can assume that the
|
|
yann@98
|
26 |
- relocated address is properly aligned, whereas the compiler is
|
|
yann@98
|
27 |
- entitled to assume that a pointer to a type is properly aligned for
|
|
yann@98
|
28 |
- the type. Even if we cast the pointer back to some other type with
|
|
yann@98
|
29 |
- less strict alignment requirements, the compiler might still
|
|
yann@98
|
30 |
- remember that the pointer was originally more aligned, thereby
|
|
yann@98
|
31 |
- optimizing away alignment tests or using word instructions for
|
|
yann@98
|
32 |
- copying memory, breaking the very code written to handle the
|
|
yann@98
|
33 |
- unaligned cases. */
|
|
yann@98
|
34 |
-# if ! ELF_MACHINE_NO_REL
|
|
yann@98
|
35 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
36 |
-elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
|
|
yann@98
|
37 |
- const ElfW(Sym) *sym, const struct r_found_version *version,
|
|
yann@98
|
38 |
- void *const reloc_addr);
|
|
yann@98
|
39 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
40 |
-elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
|
|
yann@98
|
41 |
- void *const reloc_addr);
|
|
yann@98
|
42 |
-# endif
|
|
yann@98
|
43 |
-# if ! ELF_MACHINE_NO_RELA
|
|
yann@98
|
44 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
45 |
-elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
|
|
yann@98
|
46 |
- const ElfW(Sym) *sym, const struct r_found_version *version,
|
|
yann@98
|
47 |
- void *const reloc_addr);
|
|
yann@98
|
48 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
49 |
-elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
|
|
yann@98
|
50 |
- void *const reloc_addr);
|
|
yann@98
|
51 |
-# endif
|
|
yann@98
|
52 |
-# if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL
|
|
yann@98
|
53 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
54 |
-elf_machine_lazy_rel (struct link_map *map,
|
|
yann@98
|
55 |
- ElfW(Addr) l_addr, const ElfW(Rel) *reloc);
|
|
yann@98
|
56 |
-# else
|
|
yann@98
|
57 |
-auto inline void __attribute__((always_inline))
|
|
yann@98
|
58 |
-elf_machine_lazy_rel (struct link_map *map,
|
|
yann@98
|
59 |
- ElfW(Addr) l_addr, const ElfW(Rela) *reloc);
|
|
yann@98
|
60 |
-# endif
|
|
yann@98
|
61 |
-#endif
|
|
yann@98
|
62 |
-
|
|
yann@98
|
63 |
#include <dl-machine.h>
|
|
yann@98
|
64 |
|
|
yann@98
|
65 |
#ifndef VERSYMIDX
|
|
yann@98
|
66 |
|
|
yann@98
|
67 |
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
|