about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-29 20:39:40 +0000
committerRoland McGrath <roland@gnu.org>2002-08-29 20:39:40 +0000
commitc5738211bd4a61e6950c3e4a61fbb4c366fd13df (patch)
tree63b1942a5b4b8bee015f50ec7ccb0adcd2d08894
parent459c2eef2119d858913e0c786234d7d1b4f331f5 (diff)
downloadglibc-c5738211bd4a61e6950c3e4a61fbb4c366fd13df.tar.gz
glibc-c5738211bd4a61e6950c3e4a61fbb4c366fd13df.tar.xz
glibc-c5738211bd4a61e6950c3e4a61fbb4c366fd13df.zip
* sysdeps/generic/readelflib.c (process_elf_file): Fix typo.
	* iconv/gconv_int.h: Include <stdlib.h> for alloca decl.
	(norm_add_slashes): alloca -> __alloca

	* sysdeps/generic/readelflib.c (process_elf_file): Make LOADADDR
	p_vaddr/p_offset when computing LOADADDR.
-rw-r--r--ChangeLog13
-rw-r--r--iconv/gconv_int.h3
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 60d8001834..ce7fe274f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-29  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/generic/readelflib.c (process_elf_file): Fix typo.
+
+	* iconv/gconv_int.h: Include <stdlib.h> for alloca decl.
+	(norm_add_slashes): alloca -> __alloca
+
 2002-08-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* stdio-common/vfprintf.c (vfprintf): Add builtin_expect for
@@ -7,11 +14,9 @@
 	-mcpu=ultrasparc, not only tune for it.
 	(ASFLAGS*): Set unconditionally.
 
-2002-08-29  Jakub Jelinek  <jakub@redhat.com>
-
-	* sysdeps/generic/readelflib.c (process_elf_file): Make loadaddr
+	* sysdeps/generic/readelflib.c (process_elf_file): Make LOADADDR
 	ElfW(Addr).  Don't mask upper 32-bits and lower 12 bits off from
-	p_vaddr/p_offset when computing loadaddr.
+	p_vaddr/p_offset when computing LOADADDR.
 
 2002-08-29  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index a16a5434d7..1ac878d900 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -21,6 +21,7 @@
 #define _GCONV_INT_H	1
 
 #include "gconv.h"
+#include <stdlib.h>		/* For alloca used in macro below.  */
 
 __BEGIN_DECLS
 
@@ -138,7 +139,7 @@ extern const char *__gconv_path_envvar attribute_hidden;
       if (*cp++ == '/')							      \
 	++cnt;								      \
 									      \
-    tmp = result = alloca (cp - (str) + 3 + suffix_len);		      \
+    tmp = result = __alloca (cp - (str) + 3 + suffix_len);		      \
     cp = (str);								      \
     while (*cp != '\0')							      \
       *tmp++ = __toupper_l (*cp++, &_nl_C_locobj);			      \