2011-07-12 Andrew Haley <aph@redhat.com>

[pf3gnuchains/gcc-fork.git] / libjava / configure.host

diff --git a/libjava/configure.host b/libjava/configure.host
index 2955571..105785e 100644 (file)
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -18,6 +18,8 @@
 #   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.
@@ -41,6 +43,8 @@ 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
@@ -128,7 +132,7 @@ case "${host}" in
        slow_pthread_self=yes
        ;;
   x86_64-*)
-       sysdeps_dir=x86-64
+       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.
@@ -137,6 +141,9 @@ case "${host}" in
                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=-fno-use-divide-subroutine
@@ -270,18 +277,24 @@ EOF
          rm -f conftest conftest.c
        fi
        ;;
-   i[34567]86*-kfreebsd*-gnu | x86_64*-kfreebsd*-gnu)
+  alpha*-dec-osf*)
+       can_unwind_signal=yes
+       ;;
+  i[34567]86*-kfreebsd*-gnu | x86_64*-kfreebsd*-gnu)
         libgcj_ld_symbolic='-Wl,-Bsymbolic'
         slow_pthread_self=
         ;;
   i[34567]86-*-solaris2.1[0-9]* )
-       sysdeps_dir=x86-64
+       sysdeps_dir=i386
        DIVIDESPEC=-f%{m32:no-}%{!m32:%{!m64:no-}}%{m64:}use-divide-subroutine
        ;;
+  x86_64-*-solaris2.1[0-9]* )
+       sysdeps_dir=i386
+       DIVIDESPEC=-f%{m32:no-}use-divide-subroutine
+       ;;
   mips-sgi-irix6* )
+       can_unwind_signal=yes
        sysdeps_dir=mips
-       # disable interpreter, no closure support for N32 and N64 ABIs
-       libgcj_interpreter=no
        ;;
   arm*-linux* )
        slow_pthread_self=no
@@ -316,6 +329,9 @@ EOF
        DIVIDESPEC=-fuse-divide-subroutine
        CHECKREFSPEC=-fcheck-references
        ;;
+  i?86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
+       can_unwind_signal=yes
+       ;;
   *-*-freebsd*)
        slow_pthread_self=
        ;;
@@ -338,6 +354,10 @@ EOF
        can_unwind_signal=yes
        DIVIDESPEC=-fuse-divide-subroutine
        ;;
+  sparc*-sun-solaris2.*)
+       slow_pthread_self=
+       can_unwind_signal=yes
+       ;;
 esac
 
 case "${host}" in
@@ -347,6 +367,9 @@ case "${host}" in
        BACKTRACESPEC=
        # Win32 DLLs are limited to 64k exported symbols each.
        enable_libgcj_sublibs_default=yes
+       libgcj_sublib_ltflags='$(lt_host_flags) \
+           -Wl,-u,__ZN3org4ietf4jgss10GSSManagerC1Ev,-L..,-lgcj-noncore-dummy'
+       libgcj_sublib_core_extra_deps=libgcj-noncore-dummy.dll.a
   ;;
 esac