From 01cea6990b59b90f2a8900d1ab9ff20305e487d7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 6 Sep 2002 00:03:11 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/regex.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 828f76f8a8a..70b975930d1 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2002-09-05 Roger Sayle + + * regex.c: Only use "#pragma alloca" on AIX when not using gcc. + 2002-08-07 DJ Delorie * regex.c (re_error_msgid): Just use a simple array of strings. diff --git a/libiberty/regex.c b/libiberty/regex.c index a83cda05527..e2763dc2a51 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 -- 2.30.2