From b8273627e3564ae8f7b831edd4607bd38987b1e6 Mon Sep 17 00:00:00 2001
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 19 Mar 2005 20:19:06 +0000
Subject: [PATCH] gcc: 	* config.gcc: Consistently use solaris2.1[0-9]*
 instead of 	solaris2.1[0-9].

libcpp:
	* configure.ac: Consistently use solaris2.1[0-9]* instead of
	solaris2.1[0-9].
	* configure: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96743 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog       | 5 +++++
 gcc/config.gcc      | 6 +++---
 libcpp/ChangeLog    | 6 ++++++
 libcpp/configure    | 2 +-
 libcpp/configure.ac | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b537beead25..07f6e1bbf3fa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-19  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* config.gcc: Consistently use solaris2.1[0-9]* instead of
+	solaris2.1[0-9].
+
 2005-03-19  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* builtins.c (fold_builtin_memcpy): Take decomposed arguments
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 575ced2706f8..3eb900467baa 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1061,12 +1061,12 @@ i[34567]86-*-solaris2*)
 		tmake_file="$tmake_file t-slibgcc-sld"
 	fi
 	case ${target} in
-	*-*-solaris2.[789] | *-*-solaris2.1[0-9])
+	*-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
 		tm_file="$tm_file tm-dwarf2.h"
 		;;
 	esac
 	case ${target} in
-	*-*-solaris2.1[0-9])
+	*-*-solaris2.1[0-9]*)
 		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
 		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
 		tmake_file="$tmake_file i386/t-sol2-10"
@@ -1972,7 +1972,7 @@ sparc-*-solaris2*)
 			tm_file="${tm_file} sparc/sol26-sld.h"
 		fi
 		;;
-	*-*-solaris2.[789] | *-*-solaris2.1[0-9])
+	*-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
 		tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h tm-dwarf2.h"
 		if test x$gnu_ld = xyes; then
 			tm_file="${tm_file} sparc/sol2-gld-bi.h"
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index e5ecf6d3d006..28fac2e1072c 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-19  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Consistently use solaris2.1[0-9]* instead of
+	solaris2.1[0-9].
+	* configure: Regenerate.
+
 2005-03-15  Geoffrey Keating  <geoffk@apple.com>
 
 	* charset.c (_cpp_valid_ucn): In identifiers, reject a partial
diff --git a/libcpp/configure b/libcpp/configure
index b8c2c5a4ccec..db58fcceb3df 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -7195,7 +7195,7 @@ case $target in
 	s390*-*-* | \
 	sparc64*-*-* | ultrasparc-*-freebsd* | \
 	sparcv9-*-solaris2* | \
-	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9] | \
+	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9]* | \
 	sh[123456789l]*-*-*)
 		need_64bit_hwint=yes ;;
 	*)
diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index b268d8d76bc0..aa93f653a3cc 100644
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -117,7 +117,7 @@ case $target in
 	s390*-*-* | \
 	sparc64*-*-* | ultrasparc-*-freebsd* | \
 	sparcv9-*-solaris2* | \
-	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9] | \
+	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9]* | \
 	sh[123456789l]*-*-*)
 		need_64bit_hwint=yes ;;
 	*)
-- 
2.11.4.GIT