From 14f27bc62d31edd462a7fc10cfb684a36b9e124e Mon Sep 17 00:00:00 2001
From: ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 7 Jul 2011 09:24:16 +0000
Subject: 	gcc: 	PR target/39150 	* configure.ac
 (gcc_cv_as_hidden): Also accept 	x86_64-*-solaris2.1[0-9]*. 
 (gcc_cv_as_cfi_directive): Likewise. 	(gcc_cv_as_comdat_group_group):
 Likewise. 	(set_have_as_tls): Likewise. 	* configure: Regenerate. 
 * config.gcc (i[34567]86-*-solaris2*): Also handle 
 x86_64-*-solaris2.1[0-9]*. 	* config.host (i[34567]86-*-solaris2*):
 Likewise. 	* config/sparc/sol2.h (ASM_CPU_DEFAULT_SPEC): Remove. 	*
 config/sol2-bi.h (ASM_CPU_DEFAULT_SPEC): Redefine. 	[USE_GLD]
 (ARCH_DEFAULT_EMULATION): Define. 	(TARGET_LD_EMULATION): Use it. 	*
 config/i386/sol2.h (ASM_CPU_DEFAULT_SPEC): Define. 
 (SUBTARGET_CPU_EXTRA_SPECS): Add asm_cpu_default. 	*
 config/i386/sol2-bi.h (ASM_CPU32_DEFAULT_SPEC): Define. 
 (ASM_CPU64_DEFAULT_SPEC): Define. 	(ASM_CPU_SPEC): Use
 %(asm_cpu_default). 	(ASM_SPEC): Redefine. 	(DEFAULT_ARCH32_P): Define
 using TARGET_64BIT_DEFAULT. 	* config/host-solaris.c [__x86_64__]
 (TRY_EMPTY_VM_SPACE): Reduce. 	* doc/install.texi (Specific,
 amd64-*-solaris2.1[0-9]*): 	Document. 	(Specific,
 i?86-*-solaris2.10): Mention x86_64-*-solaris2.1[0-9]* 	configuration.
 	(Specific, x86_64-*-solaris2.1[0-9]*): Document.

	gcc/ada:
	PR target/39150
	* gcc-interface/Makefile.in: Handle x86_64-solaris2.

	libgcc:
	PR target/39150
	* config.host (*-*-solaris2*): Handle x86_64-*-solaris2.1[0-9]*
	like i?86-*-solaris2.1[0-9]*.
	(i[34567]86-*-solaris2*): Also handle x86_64-*-solaris2.1[0-9]*.
	* configure.ac (i?86-*-solaris2*): Likewise.
	* configure: Regenerate.

	gcc/testsuite:
	PR target/39150
	* gcc.misc-tests/linkage.exp: Handle x86_64-*-solaris2.1[0-9]*.

	toplevel:
	PR target/39150
	* configure.ac (i[3456789]86-*-solaris2*): Also accept
	x86_64-*-solaris2.1[0-9]*.
	* configure: Regenerate.

	boehm-gc:
	PR target/39150
	* configure.ac (i?86-*-solaris2.[89]): Also accept
	x86_64-*-solaris2.1?.
	* configure: Regenerate.

	gnattools:
	PR target/39150
	* configure.ac (*86-*-solaris2*): Also accept
	x86_64-*-solaris2.1[0-9]*.
	* configure: Regenerate.

	libcpp:
	PR target/39150
	* configure.ac (host_wide_int): Handle x86_64-*-solaris2.1[0-9]
	like i[34567]86-*-solaris2.1[0-9]*.
	* configure: Regenerate.

	libgo:
	PR target/39150
	* config/libtool.m4: Handle x86_64-*-solaris2.1[0-9]* like
	i?86-*-solaris*.
	* configure: Regenerate.

	libjava:
	PR target/39150
	* configure.host (x86_64-*): Add -Usun to libgcj_flags.
	(x86_64-*-solaris2.1[0-9]*): New case.
	(i?86-*-solaris2*): Also accept x86_64-*-solaris2.1[0-9]*.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175958 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/configure.host | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'libjava/configure.host')

diff --git a/libjava/configure.host b/libjava/configure.host
index fab8c603a81..105785e5434 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -141,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
@@ -285,6 +288,10 @@ EOF
 	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
@@ -322,7 +329,7 @@ EOF
 	DIVIDESPEC=-fuse-divide-subroutine
 	CHECKREFSPEC=-fcheck-references
 	;;
-  i?86-*-solaris2*)
+  i?86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
 	can_unwind_signal=yes
 	;;
   *-*-freebsd*)
-- 
cgit v1.2.1