diff options
| author | Roland McGrath <roland@gnu.org> | 2005-03-01 20:55:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-03-01 20:55:00 +0000 |
| commit | f8286ce6138633483521fc836d4aff94a5f84d23 (patch) | |
| tree | 74863bec6337c4dde071edcb04b4b8a08bc22873 | |
| parent | a28b6b0a55c325ec7a990dc41ed5d8ec7f9af07c (diff) | |
| download | glibc-f8286ce6138633483521fc836d4aff94a5f84d23.tar.gz glibc-f8286ce6138633483521fc836d4aff94a5f84d23.tar.xz glibc-f8286ce6138633483521fc836d4aff94a5f84d23.zip | |
[BZ #721]
2005-03-01 Roland McGrath <roland@redhat.com> [BZ #721] * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside of [RESOLVE_MAP]. 2005-03-01 Alfred M. Szmidt <ams@gnu.org> * elf/dl-load.c (__stack_prot) [!PROT_GROWSUP && !PROT_GROWSDOWN]: Add missing initializer. * malloc/arena.c: #include <stdbool.h> outside of [SHARED && USE_TLS && !USE___THREAD].
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | elf/dl-load.c | 2 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 11 |
3 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c766cb7f4e..6855c8bc9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-03-01 Roland McGrath <roland@redhat.com> + + [BZ #721] + * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside + of [RESOLVE_MAP]. + +2005-03-01 Alfred M. Szmidt <ams@gnu.org> + + * elf/dl-load.c (__stack_prot) [!PROT_GROWSUP && !PROT_GROWSDOWN]: + Add missing initializer. + + * malloc/arena.c: #include <stdbool.h> outside of [SHARED && + USE_TLS && !USE___THREAD]. + 2005-02-26 GOTO Masanori <gotom@debian.or.jp> * csu/Makefile: Use printf instead of echo for some shells. diff --git a/elf/dl-load.c b/elf/dl-load.c index 088b2224e2..97e1e0089c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -110,6 +110,8 @@ int __stack_prot attribute_hidden attribute_relro = PROT_GROWSDOWN; #elif _STACK_GROWS_UP && defined PROT_GROWSUP = PROT_GROWSUP; +#else + = 0; #endif diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 761f8daeaa..e8015ac5fe 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. ARM version. - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -350,13 +350,14 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, #endif /* !dl_machine_h */ -#ifdef RESOLVE /* ARM never uses Elf32_Rela relocations for the dynamic linker. Prelinked libraries may use Elf32_Rela though. */ -# ifdef RTLD_BOOTSTRAP -# define ELF_MACHINE_NO_RELA 1 -# endif +#ifdef RTLD_BOOTSTRAP +# define ELF_MACHINE_NO_RELA 1 +#endif + +#ifdef RESOLVE /* Deal with an out-of-range PC24 reloc. */ static Elf32_Addr |