diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-05-25 16:59:45 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2010-05-25 16:59:45 +0000 |
| commit | 8352cbb413ca035b1a646cc0e595a45cdd6e1426 (patch) | |
| tree | 5c065c5b5ddaca208481e58ce228f3f42df64e19 /libjava | |
| parent | c3641fd790cbca6f2bf79fd236851e44d0a38977 (diff) | |
| download | gcc-8352cbb413ca035b1a646cc0e595a45cdd6e1426.zip gcc-8352cbb413ca035b1a646cc0e595a45cdd6e1426.tar.gz gcc-8352cbb413ca035b1a646cc0e595a45cdd6e1426.tar.bz2 | |
re PR libgcj/44216 (All libjava tests fail on IRIX 6.5: ld warns about -no-merge-exidx-entries)
PR libgcj/44216
* configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR.
Save and restore werror flag.
* configure: Regenerate.
From-SVN: r159833
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 16 | ||||
| -rw-r--r-- | libjava/configure.ac | 8 |
3 files changed, 28 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 503831c..2968be1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libgcj/44216 + * configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR. + Save and restore werror flag. + * configure: Regenerate. + 2010-05-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 diff --git a/libjava/configure b/libjava/configure index 6be8109..8f54905 100755 --- a/libjava/configure +++ b/libjava/configure @@ -599,6 +599,7 @@ ac_includes_default="\ #endif" enable_option_checking=no +ac_c_werror_flag= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -13338,7 +13339,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13341 "configure" +#line 13342 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13444,7 +13445,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13447 "configure" +#line 13448 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19423,7 +19424,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19426 "configure" +#line 19427 "configure" struct S { ~S(); }; void bar(); void foo() @@ -20528,6 +20529,14 @@ if test "${libgcj_cv_exidx+set}" = set; then : else saved_ldflags="$LDFLAGS" LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only + # warns about unknown options, which breaks the testsuite. So enable + # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn + # it off again. As a workaround, save and restore werror flag like + # AC_PATH_XTRA. + ac_xsave_c_werror_flag=$ac_c_werror_flag + +ac_c_werror_flag=yes if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi @@ -20542,6 +20551,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag LDFLAGS="${saved_ldflags}" fi diff --git a/libjava/configure.ac b/libjava/configure.ac index 664011ea..5376a01 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -932,9 +932,17 @@ esac AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx], [saved_ldflags="$LDFLAGS" LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only + # warns about unknown options, which breaks the testsuite. So enable + # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn + # it off again. As a workaround, save and restore werror flag like + # AC_PATH_XTRA. + ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag + AC_LANG_WERROR AC_LINK_IFELSE([int main(void){ return 0;} ], [eval "libgcj_cv_exidx=yes"], [eval "libgcj_cv_exidx=no"]) + ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag LDFLAGS="${saved_ldflags}"] ) if test "${libgcj_cv_exidx}" = "yes"; then |