diff options
| author | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-25 01:41:20 +0000 |
|---|---|---|
| committer | sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-25 01:41:20 +0000 |
| commit | d71e0d30078ee4343c778d0e65e28fee94c5efce (patch) | |
| tree | 4519bae1413cb73435638cd79cae7b6576032213 | |
| parent | 613879d78d1f18e596b0245e669726e8fe383f81 (diff) | |
| download | ppe42-gcc-d71e0d30078ee4343c778d0e65e28fee94c5efce.tar.gz ppe42-gcc-d71e0d30078ee4343c778d0e65e28fee94c5efce.zip | |
* configure.ac: Tweak test for HAVE_DECL_LDGETNAME to avoid a
system header conflict on AIX 5.2.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91266 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ad7c33f1c7f..5f5865c22dc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-11-24 Roger Sayle <roger@eyesopen.com> + + * configure.ac: Tweak test for HAVE_DECL_LDGETNAME to avoid a + system header conflict on AIX 5.2. + * configure: Regenerate. + 2004-11-24 Kazu Hirata <kazu@cs.umass.edu> * tree-outof-ssa.c (coalesce_abnormal_edges): Use e->dest_idx diff --git a/gcc/configure b/gcc/configure index 5ccbd34834c..48ec4dd1e80 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11355,6 +11355,10 @@ _ACEOF fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# On AIX 5.2, <ldfcn.h> conflicts with <fcntl.h>, as both define incompatible +# FREAD and FWRITE macros. Fortunately, for GCC's single usage of ldgetname +# in collect2.c, <fcntl.h> isn't visible, but the configure test below needs +# to undef these macros to get the correct value for HAVE_DECL_LDGETNAME. for ac_func in ldgetname do @@ -11376,6 +11380,8 @@ cat >>conftest.$ac_ext <<_ACEOF #include "ansidecl.h" #include "system.h" #ifdef HAVE_LDFCN_H +#undef FREAD +#undef FWRITE #include <ldfcn.h> #endif diff --git a/gcc/configure.ac b/gcc/configure.ac index 80eb7161ca8..c7e49c0fc45 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1053,10 +1053,16 @@ AC_TRY_COMPILE([ ],[rlim_t l = 0;],,[AC_DEFINE([rlim_t],[long], [Define to \`long' if <sys/resource.h> doesn't define.])]) +# On AIX 5.2, <ldfcn.h> conflicts with <fcntl.h>, as both define incompatible +# FREAD and FWRITE macros. Fortunately, for GCC's single usage of ldgetname +# in collect2.c, <fcntl.h> isn't visible, but the configure test below needs +# to undef these macros to get the correct value for HAVE_DECL_LDGETNAME. gcc_AC_CHECK_DECLS(ldgetname, , ,[ #include "ansidecl.h" #include "system.h" #ifdef HAVE_LDFCN_H +#undef FREAD +#undef FWRITE #include <ldfcn.h> #endif ]) |
