aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure14
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; }