From: DJ Delorie <dj@delorie.com>
Date: Thu, 14 Apr 2005 02:22:18 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: newlib-csl-arm-2005-q1b~144
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec047500404a787b7279d77ead267a7004bad4fe;p=pf3gnuchains%2Fpf3gnuchains4x.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 1acd083098..2ddc1d4209 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (fopen_unlocked, fdopen_unlocked, freopen_unlocked):
+	Remove parameter names.
+
 2005-04-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* libiberty.h (fopen_unlocked, fdopen_unlocked, freopen_unlocked):
diff --git a/include/ChangeLog-9103 b/include/ChangeLog-9103
index f8d3798083..f4f7aa1a5e 100644
--- a/include/ChangeLog-9103
+++ b/include/ChangeLog-9103
@@ -1,5 +1,15 @@
 2003-12-19  Andreas Tobler  <a.tobler@schweiz.ch>
 
+	* include/fibheap.h (fibnode): Use __extension__ for
+	bit-fields mark and degree if __GNUC__.
+
+2003-12-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* include/fibheap.h (fibnode): Use unsigned long int for
+	bit-fields if __GNUC__ is defined.
+
+2003-12-19  Andreas Tobler  <a.tobler@schweiz.ch>
+
 	* fibheap.h (fibnode): Use __extension__ for
 	bit-fields mark and degree if __GNUC__.
 
diff --git a/include/libiberty.h b/include/libiberty.h
index 80aee8b946..671a1239c6 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -52,9 +52,9 @@ extern "C" {
    the stream is setup to avoid any multi-threaded locking.  Otherwise
    return the FILE pointer unchanged.  */
 
-extern FILE *fopen_unlocked (const char *path, const char *mode);
-extern FILE *fdopen_unlocked (int fildes, const char *mode);
-extern FILE *freopen_unlocked (const char *path, const char *mode, FILE *stream);
+extern FILE *fopen_unlocked (const char *, const char *);
+extern FILE *fdopen_unlocked (int, const char *);
+extern FILE *freopen_unlocked (const char *, const char *, FILE *);
 
 /* Build an argument vector from a string.  Allocates memory using
    malloc.  Use freeargv to free the vector.  */
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index bdede48bbc..d06406a3e8 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* argv.c (dupargv): Allocate space of argv[argc], not 
+	sizeof(char *) of that amount.  Cast result to char *.
+
 2005-04-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* regex.c (wcs_re_match_2_internal, byte_re_match_2_internal):
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 76502058d3..ad4c9a7938 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -77,7 +77,7 @@ dupargv (char **argv)
   for (argc = 0; argv[argc] != NULL; argc++)
     {
       int len = strlen (argv[argc]);
-      copy[argc] = malloc (sizeof (char *) * (len + 1));
+      copy[argc] = (char *) malloc (len + 1);
       if (copy[argc] == NULL)
 	{
 	  freeargv (copy);