diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2009-02-28 10:55:42 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2009-02-28 10:55:42 +0000 |
| commit | e0b05a75af586156d675d122abddbe0d527b0c16 (patch) | |
| tree | 17ef58048b034eb1f5eacaabe1322c80e0f299d7 /libjava/configure | |
| parent | cdc0df58e9300ef56ac5c297255ade18a9e36e46 (diff) | |
svn merge -r143403:144476 svn+ssh://gcc.gnu.org/svn/gcc/trunk
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c-4_5-branch@144485 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libjava/configure b/libjava/configure index ec7dc2c02ff..7d1baad8a05 100755 --- a/libjava/configure +++ b/libjava/configure @@ -18795,6 +18795,9 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 enable_sjlj_exceptions=yes elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then enable_sjlj_exceptions=no + elif grep __cxa_end_cleanup conftest.s >/dev/null 2>&1 ; then + # ARM EH ABI. + enable_sjlj_exceptions=no fi fi CXXFLAGS="$old_CXXFLAGS" @@ -19137,6 +19140,11 @@ test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels ac_config_links="$ac_config_links gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc" +# Likewise for natVMSecureRandom.cc +test -d gnu/java/security/jce/prng || mkdir gnu/java/security/jce/prng + ac_config_links="$ac_config_links gnu/java/security/jce/prng/natVMSecureRandom.cc:gnu/java/security/jce/prng/natVMSecureRandom${FILE-${PLATFORM}}.cc" + + case "${host}" in *mingw*) SYSTEMSPEC="-lgdi32 -lws2_32" @@ -29565,6 +29573,7 @@ do "gnu/java/nio/natVMPipe.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natVMPipe.cc:gnu/java/nio/natVMPipe${PLATFORM}.cc" ;; "gnu/java/nio/natVMSelector.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natVMSelector.cc:gnu/java/nio/natVMSelector${PLATFORM}.cc" ;; "gnu/java/nio/channels/natFileChannelImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc" ;; + "gnu/java/security/jce/prng/natVMSecureRandom.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/security/jce/prng/natVMSecureRandom.cc:gnu/java/security/jce/prng/natVMSecureRandom${FILE-${PLATFORM}}.cc" ;; "include/java-gc.h" ) CONFIG_LINKS="$CONFIG_LINKS include/java-gc.h:include/$GCHDR" ;; "include/java-threads.h" ) CONFIG_LINKS="$CONFIG_LINKS include/java-threads.h:include/$THREADH" ;; "sysdep/locks.h" ) CONFIG_LINKS="$CONFIG_LINKS sysdep/locks.h:sysdep/$sysdeps_dir/locks.h" ;; |