This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

3.4 PATCH: Support Solaris 10


The next version of Solaris will be identified as *-*-solaris2.10.  Of
course it needs to be treated very much like Solaris 8/9, not (by matching
wildcards) like Solaris 2.1 :-)

The following straightforward patch does this by handling it like Solaris
8/9 where appropriate and removing Solaris version wildcards except where
micro releases existed.  Up to date, this holds only for Solaris 2.5/2.5.1,
which is treated appropriately.  By being careful about wildcard use, we
avoid problems with Solaris 20 etc. in the future :-)

Bootstrapped with only a single regression compared to a
sparc-sun-solaris2.8 on sparc-sun-solaris2.10.

+FAIL: g++.old-deja/g++.eh/badalloc1.C execution test

I'm not yet sure what's going on here, but this should nevertheless be good
enough for now.

Ok for mainline?

	Rainer

-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University


Fri Aug  8 00:00:31 2003  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	boehm-gc:	
	* configure.in: Remove wildcard from Solaris 8-9/Intel and Solaris
	2.3/SPARC, there are no micro versions.
	Treat Solaris 10 and up alike.
	* configure: Regenerate.
	
	gcc:
	* config.gcc (sparc-*-solaris2*): Handle Solaris 10 and up like
	Solaris 7-9.

	* fixinc/inclhack.def (solaris_widec): Replace solaris2.[0-5]* by
	wildcards which explicitly match micro versions.
	* fixinc/fixincl.x: Regenerate.

	libstdc++-v3:
	* configure.host: Handle Solaris 2.5 micro releases explicitly.
	Remove wildcards from Solaris 2.6, 7-9: there were no
	micro releases.
	Treat Solaris 10 and up like 7-9.

Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.49
diff -u -p -r1.49 configure.in
--- boehm-gc/configure.in	7 Aug 2003 21:34:18 -0000	1.49
+++ boehm-gc/configure.in	23 Sep 2003 21:40:28 -0000
@@ -257,7 +257,7 @@ case "$host" in
  alpha*-*-linux*)
     machdep="alpha_mach_dep.lo"
     ;;
- i?86-*-solaris2.[[89]]*)
+ i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
     AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
     ;;
  mipstx39-*-elf*)
@@ -279,7 +279,7 @@ case "$host" in
  sparc-*-netbsd*)
     machdep="sparc_netbsd_mach_dep.lo"
     ;;
- sparc-sun-solaris2.3*)
+ sparc-sun-solaris2.3)
     machdep="sparc_mach_dep.lo"
     AC_DEFINE(SUNOS53_SHARED_LIB)
     ;;
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.357
diff -u -p -r1.357 config.gcc
--- gcc/config.gcc	5 Sep 2003 15:34:46 -0000	1.357
+++ gcc/config.gcc	23 Sep 2003 21:40:29 -0000
@@ -1893,7 +1893,7 @@ sparc-*-solaris2*)
 			tm_file="${tm_file} sparc/sol26-sld.h"
 		fi
 		;;
-	*-*-solaris2.[789])
+	*-*-solaris2.[789] | *-*-solaris2.1[0-9])
 		tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
 		if test x$gnu_ld = xyes; then
 			tm_file="${tm_file} sparc/sol2-gld-bi.h"
Index: gcc/fixinc/inclhack.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/inclhack.def,v
retrieving revision 1.180
diff -u -p -r1.180 inclhack.def
--- gcc/fixinc/inclhack.def	29 Aug 2003 18:40:42 -0000	1.180
+++ gcc/fixinc/inclhack.def	23 Sep 2003 21:40:50 -0000
@@ -2336,7 +2336,8 @@ fix = {
 fix = {
     hackname  = solaris_widec;
     files     = widec.h;
-    mach      = '*-*-solaris2.[0-5]*';
+    mach      = '*-*-solaris2.[0-5]';
+    mach      = '*-*-solaris2.[0-5].*';
     bypass    = "include.*wchar\\.h";
     select    = "#include <euc.h>";
     c_fix     = format;
Index: libstdc++-v3/configure.host
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.host,v
retrieving revision 1.15
diff -u -p -r1.15 configure.host
--- libstdc++-v3/configure.host	5 Aug 2003 02:00:12 -0000	1.15
+++ libstdc++-v3/configure.host	23 Sep 2003 21:41:43 -0000
@@ -173,13 +173,13 @@ case "${host_os}" in
     os_include_dir="os/qnx/qnx6.1"
     c_model=c
     ;;
-  solaris2.5*)
+  solaris2.5 | solaris2.5.[0-9])
     os_include_dir="os/solaris/solaris2.5"
     ;;
-  solaris2.6*)
+  solaris2.6)
     os_include_dir="os/solaris/solaris2.6"
     ;;
-  solaris2.[789]*)
+  solaris2.[789] | solaris2.1[0-9])
     os_include_dir="os/solaris/solaris2.7"
     ;;
   windiss*)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]