[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].

diff --git a/ChangeLog b/ChangeLog
index c766cb7f4e5638d79a61dc8a6711b1fe842e4407..6855c8bc9bea69fef4f28d25bfd40edc078fba45 100644 (file)
--- 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 088b2224e2631b8f881484a9f2c674e68fc75bfe..97e1e0089cf99601ce1c1d456673f9ade6b096bb 100644 (file)
--- 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 761f8daeaabe75e002285c9f9e429c7200c291d6..e8015ac5fe120bea1e808aa349e9d50feb1ad69f 100644 (file)
--- 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