diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/configure.ac | 10 | ||||
| -rw-r--r-- | libjava/configure.host | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e5e709fe..4c37583 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-06-01 Bryce McKinlay <mckinlay@redhat.com> + + * configure.ac (BACKTRACESPEC): Remove definition, but continue to + AC_SUBST definition from configure.host. + * configure.host: Don't use -fno-omit-frame-pointer. Set BACKTRACESPEC + to -fomit-frame-pointer on 32-bit x86 targets. + 2005-06-01 Tom Tromey <tromey@redhat.com> * java/io/ObjectInputStream.java (currentLoader): Fixed typo. diff --git a/libjava/configure.ac b/libjava/configure.ac index b28d1e3..a7d9d20 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1148,6 +1148,7 @@ AC_SUBST(ZINCS) AC_SUBST(DIVIDESPEC) AC_SUBST(CHECKREFSPEC) AC_SUBST(EXCEPTIONSPEC) +AC_SUBST(BACKTRACESPEC) AC_SUBST(IEEESPEC) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes) @@ -1345,15 +1346,6 @@ if test "$enable_sjlj_exceptions" = yes; then SIGNAL_HANDLER_AUX= fi -# Define here any compiler flags that you need in order to make backtrace() work. -BACKTRACESPEC= -case "${host}" in - x86_64*-*-linux*|i?86-*) - BACKTRACESPEC=-fno-omit-frame-pointer - ;; -esac -AC_SUBST(BACKTRACESPEC) - AC_SUBST(SYSDEP_SOURCES) if test -z "$SIGNAL_HANDLER_AUX"; then diff --git a/libjava/configure.host b/libjava/configure.host index aec0304..5f32bfb 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -69,6 +69,7 @@ echo "$target" DIVIDESPEC=-fuse-divide-subroutine EXCEPTIONSPEC=-fnon-call-exceptions CHECKREFSPEC= +BACKTRACESPEC= # This case statement supports per-CPU defaults. case "${host}" in @@ -94,17 +95,18 @@ case "${host}" in ;; i686-*|i586-*|i486-*|i386-*) sysdeps_dir=i386 - libgcj_flags="${libgcj_flags} -ffloat-store -fno-omit-frame-pointer" + libgcj_flags="${libgcj_flags} -ffloat-store" libgcj_interpreter=yes libgcj_cxxflags= libgcj_cflags= DIVIDESPEC=-fno-use-divide-subroutine + BACKTRACESPEC=-fomit-frame-pointer enable_hash_synchronization_default=yes slow_pthread_self=yes ;; x86_64-*) sysdeps_dir=x86-64 - libgcj_flags="${libgcj_flags} -ffloat-store -fno-omit-frame-pointer" + libgcj_flags="${libgcj_flags} -ffloat-store" libgcj_cxxflags= libgcj_cflags= DIVIDESPEC=-f%{m32:no-}use-divide-subroutine @@ -266,6 +268,8 @@ esac case "${host}" in *-cygwin* | *-mingw*) fallback_backtrace_h=sysdep/i386/backtrace.h + # We need a frame pointer on Windows, so override BACKTRACESPEC + BACKTRACESPEC= ;; esac |