X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fconfigure.host;h=105785e5434f844a55e9db1ef069627c6e028506;hb=40469349494074e364a785ec1796e2be694a0483;hp=f3b4fd2da3463a873f6fb388a564f71af1cff036;hpb=ec240e23dd1647e8b4a26fe16386166d204277f0;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/configure.host b/libjava/configure.host index f3b4fd2da34..105785e5434 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -18,30 +18,41 @@ # libgcj_cflags Special CFLAGS to use when building # libgcj_cxxflags Special CXXFLAGS to use when building # libgcj_javaflags Special JAVAFLAGS to use when building +# libgcj_sublib_ltflags Special Libtool flags to use when building sublibs +# libgcj_sublib_core_extra_deps Extra dependencies to add to core sublib # libgcj_interpreter If the bytecode interpreter supports this platform. # enable_java_net_default If java.net native code should be enabled by # default. # enable_hash_synchronization_default If hash synchronization should be # enabled by default. +# enable_libgcj_sublibs_default Whether to build libgcj as a bunch of +# separate shared libraries or in one +# monolithic one. # sysdeps_dir Directory containing system-dependent headers # slow_pthread_self The synchronization code should try to avoid # pthread_self calls by caching thread IDs in a hashtable # can_unwind_signal Set to "yes" if the EH unwinder supports throwing # from a signal handler. -# disable_dladdr Set to "yes" if dladdr should not be used -# (i.e it is broken). +# fallback_backtrace_h Header to use for fallback backtrace implementation +# (only for targets that don't support DWARF2 unwind) +# descriptor_h Header to use for looking past function descriptors +# use_libgcj_bc Whether to build a "libgcj-bc" library for BC-ABI +# binaries to link against. libgcj_flags= libgcj_cflags= libgcj_cxxflags= libgcj_javaflags= +libgcj_sublib_ltflags= +libgcj_sublib_core_extra_deps= libgcj_interpreter= enable_java_net_default=yes enable_hash_synchronization_default=no +enable_libgcj_sublibs_default=no sysdeps_dir=generic slow_pthread_self= can_unwind_signal=no -disable_dladdr= +fallback_backtrace_h=sysdep/generic/backtrace.h case "${target_optspace}:${host}" in yes:*) @@ -65,10 +76,12 @@ echo "$target" DIVIDESPEC=-fuse-divide-subroutine EXCEPTIONSPEC=-fnon-call-exceptions CHECKREFSPEC= +BACKTRACESPEC= +ATOMICSPEC= # This case statement supports per-CPU defaults. case "${host}" in - arm*-elf | strongarm*-elf | xscale*-elf) + arm*-elf) with_libffi_default=no PROCESS=Ecos FILE=Posix @@ -77,6 +90,17 @@ case "${host}" in enable_java_net_default=no enable_getenv_properties_default=no enable_main_args_default=no + sysdeps_dir=arm + ;; + arm*-linux*) + libgcj_interpreter=yes + sysdeps_dir=arm + fallback_backtrace_h=sysdep/arm/backtrace.h + libgcj_cxxflags=-Wno-abi + ATOMICSPEC=-fuse-atomic-builtins + # Work around a strange libtool feature that causes libraries + # to be linked with libgcc_s but not libgcc. + LDFLAGS="${LDFLAGS} -Wl,-lgcc" ;; mips-tx39-*|mipstx39-unknown-*) libgcj_flags="${libgcj_flags} -G 0" @@ -88,9 +112,18 @@ case "${host}" in enable_java_net_default=no enable_getenv_properties_default=no ;; + mips*-*) + libgcj_interpreter=yes + ;; i686-*|i586-*|i486-*|i386-*) sysdeps_dir=i386 - libgcj_flags="${libgcj_flags} -ffloat-store -fno-omit-frame-pointer" + # With -fomit-frame-pointer -maccumulate-outgoing-args (implied), + # the .text section of libgcj.so is 30k larger, and the .eh_frame + # section is 1.4M smaller. + libgcj_flags="${libgcj_flags} -ffloat-store -fomit-frame-pointer" + # On Solaris we have defined 'sun' which later conflicts with + # namespace usage. So to work this away we use the below undefine. + libgcj_flags="${libgcj_flags} -Usun" libgcj_interpreter=yes libgcj_cxxflags= libgcj_cflags= @@ -99,11 +132,21 @@ case "${host}" in slow_pthread_self=yes ;; x86_64-*) - sysdeps_dir=x86-64 - libgcj_flags="${libgcj_flags} -ffloat-store -fno-omit-frame-pointer" + sysdeps_dir=i386 + # For 64-bit we always use SSE registers for arithmetic, + # which doesn't have the extra precision problems of the fpu. + # But be careful about 32-bit multilibs. + case " $CC " in + *" -m32 "*) + libgcj_flags="${libgcj_flags} -ffloat-store" ;; + esac + libgcj_flags="${libgcj_flags} -fomit-frame-pointer" + # On Solaris we have defined 'sun' which later conflicts with + # namespace usage. So to work this away we use the below undefine. + libgcj_flags="${libgcj_flags} -Usun" libgcj_cxxflags= libgcj_cflags= - DIVIDESPEC=-f%{m32:no-}use-divide-subroutine + DIVIDESPEC=-fno-use-divide-subroutine enable_hash_synchronization_default=yes slow_pthread_self=yes libgcj_interpreter=yes @@ -115,6 +158,15 @@ case "${host}" in enable_hash_synchronization_default=yes IEEESPEC=-mieee ;; + hppa*-*) + sysdeps_dir=pa + libgcj_interpreter=yes + enable_hash_synchronization_default=no + ;; + m68k-*) + sysdeps_dir=m68k + libgcj_interpreter=yes + ;; powerpc64*-*) sysdeps_dir=powerpc libgcj_interpreter=yes @@ -133,9 +185,14 @@ case "${host}" in s390*-*) sysdeps_dir=s390 libgcj_interpreter=yes + DIVIDESPEC=-fno-use-divide-subroutine enable_hash_synchronization_default=yes ;; sparc*-*) + sysdeps_dir=sparc + # On Solaris we have defined 'sun' which later conflicts with + # namespace usage. So to work this away we use the below undefine. + libgcj_flags="${libgcj_flags} -Usun" libgcj_interpreter=yes ;; ia64-*) @@ -149,6 +206,7 @@ case "${host}" in libgcj_flags="${libgcj_flags} -mieee" libgcj_interpreter=yes enable_hash_synchronization_default=yes + IEEESPEC=-mieee ;; esac @@ -164,8 +222,11 @@ case "${host}" in sparc*-linux* | \ ia64-* | \ x86_64*-linux* | \ + hppa*-linux* | \ + m68k*-linux* | \ sh-linux* | sh[34]*-linux*) can_unwind_signal=yes + libgcj_ld_symbolic='-Wl,-Bsymbolic' if test x$slow_pthread_self = xyes \ && test x$cross_compiling != xyes; then cat > conftest.c <