merge from gcc

2 files changed, 13 insertions, 0 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index 157dbff4db3..99bd9320278 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (reconcat): New function.
+
 2001-09-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* libiberty.h (concat, concat_length, concat_copy, concat_copy2,
diff --git a/include/libiberty.h b/include/libiberty.h
index a54e3adf05e..315d3106c4b 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -91,6 +91,15 @@ extern const char *lbasename PARAMS ((const char *));
 
 extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC;
 
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  The first argument is
+   not one of the strings to be concatenated, but if not NULL is a
+   pointer to be freed after the new string is created, similar to the
+   way xrealloc works.  */
+
+extern char *reconcat PARAMS ((char *, const char *, ...)) ATTRIBUTE_MALLOC;
+
 /* Determine the length of concatenating an arbitrary number of
    strings.  You must pass NULL as the last argument of this function,
    to terminate the list of strings.  */