diff options
| author | Bryce McKinlay <bmckinlay@gmail.com> | 2009-12-09 18:45:13 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2009-12-09 18:45:13 +0000 |
| commit | 5df19a915e5519446f457d5be782066f178da12d (patch) | |
| tree | 70a63b773655f28980f5e5a4154331e0ead49b05 /libjava/configure | |
| parent | af078bb0cf6e9b547c4f883e294f529914339cd0 (diff) | |
| download | gcc-5df19a915e5519446f457d5be782066f178da12d.zip gcc-5df19a915e5519446f457d5be782066f178da12d.tar.gz gcc-5df19a915e5519446f457d5be782066f178da12d.tar.bz2 | |
re PR java/41991 (gcj segfaults on i686-apple-darwin9 and x86_64-apple-darwin9)
2009-12-09 Bryce McKinlay <bmckinlay@gmail.com>
PR java/41991
* configure.ac (SYSTEMSPEC): Pass -allow_stack_execute to Darwin
linker.
* Makefile.am (gij_LDFLAGS): Remove extra_gij_ldflags.
* configure: Regenerate.
* Makefile.in: Regenerate.
From-SVN: r155113
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libjava/configure b/libjava/configure index 9c1e00a..1a7d625 100755 --- a/libjava/configure +++ b/libjava/configure @@ -704,7 +704,6 @@ GCLIBS LIBGCJTESTSPEC LIBSTDCXXSPEC extra_ldflags -extra_gij_ldflags extra_ldflags_libjava X_EXTRA_LIBS X_LIBS @@ -13245,7 +13244,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13248 "configure" +#line 13247 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13351,7 +13350,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13354 "configure" +#line 13353 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19216,7 +19215,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19219 "configure" +#line 19218 "configure" struct S { ~S(); }; void bar(); void foo() @@ -19546,6 +19545,9 @@ case "${host}" in SYSTEMSPEC="-lunicows $SYSTEMSPEC" fi ;; + *-*-darwin[912]*) + SYSTEMSPEC="-allow_stack_execute" + ;; *) SYSTEMSPEC= ;; @@ -20297,9 +20299,6 @@ case "${host}" in # on Darwin -single_module speeds up loading of the dynamic libraries. extra_ldflags_libjava=-Wl,-single_module ;; -*-*-darwin[912]*) - extra_gij_ldflags=-Wl,-allow_stack_execute - ;; arm*linux*eabi) # Some of the ARM unwinder code is actually in libstdc++. We # could in principle replicate it in libgcj, but it's better to @@ -20318,7 +20317,6 @@ esac - # Allow the GC to be disabled. Can be useful when debugging. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for garbage collector to use" >&5 $as_echo_n "checking for garbage collector to use... " >&6; } |