diff options
| author | DJ Delorie <dj@delorie.com> | 2002-09-06 00:03:11 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2002-09-06 00:03:11 +0000 |
| commit | 17a1a2e076bd826defe9d66c50a4bd515e3e5f71 (patch) | |
| tree | ea52883105c14640b91f277fa45499d879cd78c4 | |
| parent | 184a7522023cf6e4accdd176989223feb54ce1c3 (diff) | |
| download | binutils-redhat-17a1a2e076bd826defe9d66c50a4bd515e3e5f71.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/regex.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 828f76f8a8..70b975930d 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 a83cda0552..e2763dc2a5 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 |