FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/44216 (All libjava tests fail on IRIX 6.5: ld warns about -no-merge-exidx-entries)

Browse source 
PR libgcj/44216
	* configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR.
	Save and restore werror flag.
	* configure: Regenerate.

From-SVN: r159833
This commit is contained in:
Rainer Orth 2010-05-25 16:59:45 +00:00 • committed by Rainer Orth
parent c3641fd790
commit 8352cbb413
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -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

16
libjava/configure vendored
View file

@ -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

8
libjava/configure.ac
View file

@ -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