merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 828f76f..70b9759 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-05  Roger Sayle  <roger@eyesopen.com>
+
+       * regex.c: Only use "#pragma alloca" on AIX when not using gcc.
+
 2002-08-07  DJ Delorie  <dj@redhat.com>
 
        * regex.c (re_error_msgid): Just use a simple array of strings.

diff --git a/libiberty/regex.c b/libiberty/regex.c
index a83cda0..e2763dc 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -25,7 +25,7 @@
    routines with an "x" prefix so they do not collide with the native regex
    routines or with other components regex routines. */
 /* AIX requires this to be the first thing in the file. */
-#if defined _AIX && !defined REGEX_MALLOC
+#if defined _AIX && !defined __GNUC__ && !defined REGEX_MALLOC
   #pragma alloca
 #endif