aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-09-06 00:03:11 +0000
committerDJ Delorie <dj@redhat.com>2002-09-06 00:03:11 +0000
commit01cea6990b59b90f2a8900d1ab9ff20305e487d7 (patch)
tree081500bc3ee24a48792f04d5e5a78055869308f1 /libiberty
parentdbbfa733b4109727dfe13533c21df5c4b8d74d96 (diff)
downloadgdb-01cea6990b59b90f2a8900d1ab9ff20305e487d7.zip
gdb-01cea6990b59b90f2a8900d1ab9ff20305e487d7.tar.gz
gdb-01cea6990b59b90f2a8900d1ab9ff20305e487d7.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/regex.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 828f76f..70b9759 100644
--- 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
--- 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