merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 67ce0571fb4ce5260251a63f2f7f1041ec359062..64cd7be6c4f82b75eecc373acfd30acb83e223aa 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * libiberty.h (C_alloca): Add ATTRIBUTE_MALLOC.
+
 2002-01-27  David O'Brien  <obrien@FreeBSD.org>
 
        * cgen.h (BFD_VERSION): Use BFD_VERSION_DATE instead.

diff --git a/include/libiberty.h b/include/libiberty.h
index 455643d3a92c5764de1b2043314be4e600e40d48..3e0ca096c02800f7f696d76543fafde61ad8d257 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -1,6 +1,6 @@
 /* Function declarations for libiberty.
 
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
@@ -283,7 +283,7 @@ extern int vasprintf PARAMS ((char **, const char *, va_list))
    USE_C_ALLOCA yourself.  The canonical autoconf macro C_ALLOCA is
    also set/unset as it is often used to indicate whether code needs
    to call alloca(0).  */
-extern PTR C_alloca PARAMS((size_t));
+extern PTR C_alloca PARAMS ((size_t)) ATTRIBUTE_MALLOC;
 #undef alloca
 #if GCC_VERSION >= 2000 && !defined USE_C_ALLOCA
 # define alloca(x) __builtin_alloca(x)