From: DJ Delorie <dj@redhat.com>
Date: Sat, 31 Mar 2001 19:05:20 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=129e8d96a5ef8bc519048f38850b80a08bced210;p=binutils-gdb.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 2c5bc85136a..550af2e9f98 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (alloca): Handle setting C_ALLOCA.
+
 2001-03-20  Jim Blandy  <jimb@redhat.com>
 
 	* demangle.h (enum gnu_v3_constructor_kinds,
diff --git a/include/libiberty.h b/include/libiberty.h
index c7a4d060c11..effe5f628cc 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -238,15 +238,20 @@ extern int vasprintf PARAMS ((char **, const char *, va_list))
 /* Drastically simplified alloca configurator.  If we're using GCC,
    we use __builtin_alloca; otherwise we use the C alloca.  The C
    alloca is always available.  You can override GCC by defining
-   USE_C_ALLOCA yourself.  */
+   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));
 #undef alloca
 #if GCC_VERSION >= 2000 && !defined USE_C_ALLOCA
 # define alloca(x) __builtin_alloca(x)
+# undef C_ALLOCA
 #else
 # define alloca(x) C_alloca(x)
 # undef USE_C_ALLOCA
 # define USE_C_ALLOCA 1
+# undef C_ALLOCA
+# define C_ALLOCA 1
 #endif
 
 #ifdef __cplusplus