diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0db19858e21b907b45216b9d34ace13178943adc..6252ecaff5fca9afc3a2cb494886187d8ff3dc28 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-28  Chris Demetriou  <cgd@sibyte.com>
+
+	* configure.in (sparc-hal-solaris2*): protect [] glob from
+	my expansion.
+	(mips*-*-ecoff*, mips*-*-elf*, mips*-*-*): use MASK_ defines
+	rather than hard-coded constants in target_cpu_default2.
+	* configure: Regenerate.
+
 2000-04-28  Jason Merrill  <jason@casey.cygnus.com>
 
 	* tree.c (get_callee_fndecl): Extract the initial value from
diff --git a/gcc/configure b/gcc/configure
index d8d2056253c350006a84920c596de787281b05ea..d3101033f14d28988baea21fc78627655d79b8e0 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1354,7 +1354,7 @@ else
 fi
 
 # Find some useful tools
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5983,7 +5983,7 @@ for machine in $build $host $target; do
                 xmake_file=sparc/x-sysv4
                 extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
                 case $machine in
-                *-*-solaris2.0-4)
+                *-*-solaris2.[0-4])
                         float_format=i128
                 ;;
                 *)
@@ -6312,16 +6312,16 @@ for machine in $build $host $target; do
 		then
 			if test x$gnu_ld = xyes
 			then
-				target_cpu_default2=20
+				target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
 			else
-				target_cpu_default2=16
+				target_cpu_default2="MASK_GAS"
 			fi
 		fi
 		;;
 	mips*-*-*)
 		if test x$gas = xyes
 		then
-			target_cpu_default2=16
+			target_cpu_default2="MASK_GAS"
 		fi
 		;;
 	powerpc*-*-* | rs6000-*-*)
diff --git a/gcc/configure.in b/gcc/configure.in
index d410f5327eeb45c4c9cd92829b4fa8117d41c8c0..f3863b93a19cc36ff003d8bb18157dc966b38c3a 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3363,7 +3363,9 @@ changequote([,])dnl
                 xmake_file=sparc/x-sysv4
                 extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
                 case $machine in
+changequote(,)dnl
                 *-*-solaris2.[0-4])
+changequote([,])dnl
                         float_format=i128
                 ;;
                 *)
@@ -3700,16 +3702,16 @@ changequote([,])dnl
 		then
 			if test x$gnu_ld = xyes
 			then
-				target_cpu_default2=20
+				target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
 			else
-				target_cpu_default2=16
+				target_cpu_default2="MASK_GAS"
 			fi
 		fi
 		;;
 	mips*-*-*)
 		if test x$gas = xyes
 		then
-			target_cpu_default2=16
+			target_cpu_default2="MASK_GAS"
 		fi
 		;;
 	powerpc*-*-* | rs6000-*-*)