aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-03-31 19:05:20 +0000
committerDJ Delorie <dj@redhat.com>2001-03-31 19:05:20 +0000
commitaa38a0227cdbabfcecc0a83b104146853da6b319 (patch)
tree397bc01aac5f20c6387a4c27fde04058c3e258a0
parentc796f4f1e683929d19ab1c1335e374bce592dbcf (diff)
downloadnewlib-aa38a0227cdbabfcecc0a83b104146853da6b319.zip
newlib-aa38a0227cdbabfcecc0a83b104146853da6b319.tar.gz
newlib-aa38a0227cdbabfcecc0a83b104146853da6b319.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog4
-rw-r--r--include/libiberty.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 2c5bc85..550af2e 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 c7a4d06..effe5f6 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