configure.in: Remove wildcard from Solaris 8-9/Intel and Solaris 2.3/SPARC...

	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.

From-SVN: r71914

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 2d6d229b971a5cb58002298a5cb516baa33dcb16..ec1d28fabd81b8149ecd9a065580d6d08e5fc294 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-29  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * 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.
+
 2003-09-22  Anthony Green  <green@redhat.com>
 
        * os_dep.c: Fix GC_get_stack_base build problem for vanilla elf

diff --git a/boehm-gc/configure b/boehm-gc/configure
index 0ef1af8e77186e9fa1213f5f4e3f7033804ff8db..f75df12a3c58f16b070e0612d15eb5ced94d559d 100755 (executable)
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -3089,7 +3089,7 @@ case "$host" in
  alpha*-*-linux*)
     machdep="alpha_mach_dep.lo"
     ;;
- i?86-*-solaris2.[89]*)
+ i?86-*-solaris2.[89] | i?86-*-solaris2.1?)
     cat >> confdefs.h <<\EOF
 #define SOLARIS25_PROC_VDB_BUG_FIXED 1
 EOF
@@ -3123,7 +3123,7 @@ EOF
  sparc-*-netbsd*)
     machdep="sparc_netbsd_mach_dep.lo"
     ;;
- sparc-sun-solaris2.3*)
+ sparc-sun-solaris2.3)
     machdep="sparc_mach_dep.lo"
     cat >> confdefs.h <<\EOF
 #define SUNOS53_SHARED_LIB 1

diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 637c8ad35fdca5469c0b65e7c025a028539361a2..96da3c31ed3e51d5ac75c4e319fdf4cd3659388a 100644 (file)
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -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)
     ;;

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 307e9b76fd9d786e1a83b20af96d61041813a7d4..4534bbc904ccab3cd36a0314e95152b3976e8fd4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-29  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * 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.
+
 2003-09-29  Kazu Hirata  <kazu@cs.umass.edu>
 
        * fold-const.c (fold): Fold (A & ~B) - (A & B) into

diff --git a/gcc/config.gcc b/gcc/config.gcc
index c79167e0f4adc2100fa73cb20eaee0ea872eb11d..912f696f580b42122c657017a8e66e2af5f3f8e2 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1986,7 +1986,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"

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index bbc664b4ee8fff4f50e4fd31bfcae03b34c8b505..7e2045f1f17d86c824eb0d4a9829a3571339c66c 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Friday August 29, 2003 at 01:36:38 PM EDT
+ * It has been AutoGen-ed  Monday September  1, 2003 at 01:54:41 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Aug 29 13:36:38 EDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Sep  1 13:54:42 MEST 2003
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -4142,7 +4142,8 @@ tSCC zSolaris_WidecList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzSolaris_WidecMachs[] = {
-        "*-*-solaris2.[0-5]*",
+        "*-*-solaris2.[0-5]",
+        "*-*-solaris2.[0-5].*",
         (const char*)NULL };
 
 /*

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index edf28b5cf0eb2a03ec1eef9994819b00d32274d1..47339b4e4e96cc65da8785a4171a19ae9b1cda39 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -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;

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d6713f2d82cf10080e51c261e03290ab15e5a6cd..58fdc7112fede16f18fea94332a0e9f95fc482ac 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-29  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * 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.
+
 2003-09-29  Paolo Carlini  <pcarlini@unitus.it>
 
        * include/bits/stl_algo.h (search_n): Improve the previous

diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index ccc6ef9d1ae38f7679c2116bf093c0286c0faa60..e830e1b7a4e21c410537e065b70d1d191bc3c38f 100644 (file)
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -179,13 +179,13 @@ case "${host_os}" in
     echo "Please specify the full version of Solaris, ie. solaris2.9 " 1>&2
     exit 1;
     ;;
-  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*)