merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 5bc63bbe38f048b1e18a1ca7dfe1afb1c819e98d..4c8d105093ee5933810d3bb13e80e0e5f8319e27 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC.
+
 2005-03-22  Bob Wilson  <bob.wilson@acm.org>
 
        * xtensa-isa.h: Update a comment and whitespace.

diff --git a/include/libiberty.h b/include/libiberty.h
index 0814695a04a84fc71330ed6d0a65ea6f96255cf4..d2a8a0b9ef7fbb1f94d33376181cd27b31e99571 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -162,7 +162,7 @@ extern long get_run_time PARAMS ((void));
    return value using malloc.  */
 
 extern char *make_relative_prefix PARAMS ((const char *, const char *,
-                                          const char *));
+                                          const char *)) ATTRIBUTE_MALLOC;
 
 /* Choose a temporary directory to use for scratch files.  */