* configure.in: Avoid [[ by using test and changequote.

	* configure: Rebuild.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@21726 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 454 insertions, 322 deletions

diff --git a/gcc/configure.in b/gcc/configure.in
index 485debaacc5..f2bb35f44a3 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -66,7 +66,7 @@ no)	;;
 esac])
 
 # Default local prefix if it is empty
-if [[ x$local_prefix = x ]]; then
+if test x$local_prefix = x; then
 	local_prefix=/usr/local
 fi
 
@@ -102,7 +102,7 @@ esac])
 cpp_main=cccp
 AC_ARG_ENABLE(c-cpplib,
 [  --enable-c-cpplib       Use cpplib for C and C++.],
-if [[[ x$enable_c_cpplib != xno ]]]; then
+if test x$enable_c_cpplib != xno; then
   extra_c_objs="${extra_c_objs} cpplib.o cppexp.o cpphash.o cpperror.o"
   extra_c_objs="${extra_c_objs} prefix.o"
   extra_cxx_objs="${extra_cxx_objs} ../cpplib.o ../cppexp.o ../cpphash.o ../cpperror.o ../prefix.o"
@@ -113,7 +113,7 @@ fi)
 # Enable Multibyte Characters for C/C++
 AC_ARG_ENABLE(c-mbchar,
 [  --enable-c-mbchar       Enable multibyte characters for C and C++.],
-if [[[ x$enable_c_mbchar != xno ]]]; then
+if test x$enable_c_mbchar != xno; then
   extra_c_flags=-DMULTIBYTE_CHARS=1
 fi)
   
@@ -136,7 +136,7 @@ AC_ARG_ENABLE(init-priority,
 			  for static objects.
   --disable-init-priority Conform to ISO C++ rules for ordering static objects
 			  (i.e. initialized in order of declaration). ],
-if [[[ x$enable_init_priority != xno ]]]; then
+if test x$enable_init_priority != xno; then
   extra_c_flags=-DUSE_INIT_PRIORITY
 fi)
 
@@ -146,7 +146,7 @@ fi)
 AC_ARG_ENABLE(threads,
 [  --enable-threads        enable thread usage for target GCC.
   --enable-threads=LIB    use LIB thread package for target GCC.],
-if [[[ x$enable_threads = xno ]]]; then
+if test x$enable_threads = xno; then
 	enable_threads=''
 fi,
 enable_threads='')
@@ -284,7 +284,7 @@ for machine in $build $host $target; do
 	# Set this to override the default target model.
 	target_cpu_default=
 	# Set this to control which fixincludes program to use.
-	if [[ x$fast_fixinc != xyes ]] ; then
+	if test x$fast_fixinc != xyes; then
 		fixincludes=fixincludes
 	else fixincludes=fixinc.sh ; fi
 	# Set this to control how the header file directory is installed.
@@ -320,7 +320,9 @@ for machine in $build $host $target; do
 	c*-convex-*)
 		cpu_type=convex
 		;;
-	i[[34567]]86-*-*)
+changequote(,)dnl
+	i[34567]86-*-*)
+changequote([,])dnl
 		cpu_type=i386
 		;;
 	hppa*-*-*)
@@ -360,11 +362,11 @@ for machine in $build $host $target; do
 		rest=`echo $machine | sed -e "s/$cpu_type-//"`
 		xm_file=${cpu_type}/xm-$rest.h
 		tm_file=${cpu_type}/$rest.h
-		if [[ -f $srcdir/config/${cpu_type}/x-$rest ]] ; \
+		if test -f $srcdir/config/${cpu_type}/x-$rest; \
 		then xmake_file=${cpu_type}/x-$rest; \
 		else true; \
 		fi
-		if [[ -f $srcdir/config/${cpu_type}/t-$rest ]] ; \
+		if test -f $srcdir/config/${cpu_type}/t-$rest; \
 		then tmake_file=${cpu_type}/t-$rest; \
 		else true; \
 		fi
@@ -405,7 +407,7 @@ for machine in $build $host $target; do
 		fixincludes=fixinc.wrap
 		xmake_file=none
 		gas=yes gnu_ld=yes
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
  			thread_file='posix'
  		fi
 		;;
@@ -417,7 +419,7 @@ for machine in $build $host $target; do
 		xmake_file=none
 		fixincludes=Makefile.in
 		gas=yes gnu_ld=yes
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
  			thread_file='posix'
  		fi
 		;;
@@ -433,11 +435,11 @@ for machine in $build $host $target; do
 		;;
 		
 	alpha*-dec-osf*)
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas != xyes ]]
+		if test x$gas != xyes
 		then
 			extra_passes="mips-tfile mips-tdump"
 		fi
@@ -446,7 +448,9 @@ for machine in $build $host $target; do
 		  *-*-osf1*)
 		    tm_file="${tm_file} alpha/osf.h alpha/osf12.h alpha/osf2or3.h"
 		    ;;
-		  *-*-osf[[23]]*)
+changequote(,)dnl
+		  *-*-osf[23]*)
+changequote([,])dnl
 		    tm_file="${tm_file} alpha/osf.h alpha/osf2or3.h"
 		    ;;
 		  *-*-osf4*)
@@ -457,7 +461,9 @@ for machine in $build $host $target; do
 		    ;;
 		esac
 		case $machine in
-		  *-*-osf4.0[[b-z]] | *-*-osf4.[[1-9]]*)
+changequote(,)dnl
+		  *-*-osf4.0[b-z] | *-*-osf4.[1-9]*)
+changequote([,])dnl
 		    target_cpu_default=MASK_SUPPORT_ARCH
 		    ;;
 		esac
@@ -478,11 +484,11 @@ for machine in $build $host $target; do
 		extra_host_objs=oldnames.o
 		extra_gcc_objs="spawnv.o oldnames.o"
 		fixincludes=fixinc.winnt
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			extra_programs=ld.exe
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		;;
@@ -499,12 +505,14 @@ for machine in $build $host $target; do
 		tm_file=arm/coff.h
 		tmake_file=arm/t-bare
 		;;
-	arm-*-riscix1.[[01]]*)		# Acorn RISC machine (early versions)
+changequote(,)dnl
+	arm-*-riscix1.[01]*)		# Acorn RISC machine (early versions)
+changequote([,])dnl
 		tm_file=arm/riscix1-1.h
 		use_collect2=yes
 		;;
 	arm-*-riscix*)			# Acorn RISC machine
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 		    tm_file=arm/rix-gas.h
 		else
@@ -621,18 +629,20 @@ for machine in $build $host $target; do
 		tm_file="pa/pa-oldas.h ${tm_file} pa/pa-hpux7.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/gas.h"
 		fi
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
-	hppa1.0-*-hpux8.0[[0-2]]*)
+changequote(,)dnl
+	hppa1.0-*-hpux8.0[0-2]*)
+changequote([,])dnl
 		tm_file="${tm_file} pa/pa-hpux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		else
@@ -641,12 +651,14 @@ for machine in $build $host $target; do
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
-	hppa1.1-*-hpux8.0[[0-2]]*)
+changequote(,)dnl
+	hppa1.1-*-hpux8.0[0-2]*)
+changequote([,])dnl
 		target_cpu_default=1
 		tm_file="${tm_file} pa/pa-hpux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		else
@@ -660,7 +672,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -671,7 +683,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -684,14 +696,14 @@ for machine in $build $host $target; do
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
 		tmake_file=pa/t-pa
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		if [[ x$enable_threads = x ]]; then
+		if test x$enable_threads = x; then
 		    enable_threads=$have_pthread_h
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='dce'
 			tmake_file="${tmake_file} pa/t-dce-thr"
 		fi
@@ -702,14 +714,14 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux10.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		if [[ x$enable_threads = x ]]; then
+		if test x$enable_threads = x; then
 		    enable_threads=$have_pthread_h
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='dce'
 			tmake_file="${tmake_file} pa/t-dce-thr"
 		fi
@@ -721,7 +733,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -732,7 +744,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -744,7 +756,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hiux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -755,7 +767,7 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hiux.h"
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
@@ -769,8 +781,10 @@ for machine in $build $host $target; do
 		;;
 	i370-*-mvs*)
 		;;
-	i[[34567]]86-ibm-aix*)		# IBM PS/2 running AIX
-                if [[ x$gas = xyes ]]
+changequote(,)dnl
+	i[34567]86-ibm-aix*)		# IBM PS/2 running AIX
+changequote([,])dnl
+                if test x$gas = xyes
 		then
 			tm_file=i386/aix386.h
 			extra_parts="crtbegin.o crtend.o"
@@ -783,11 +797,13 @@ for machine in $build $host $target; do
 		xm_defines=USG
 		xmake_file=i386/x-aix
 		;;
-	i[[34567]]86-ncr-sysv4*)	# NCR 3000 - ix86 running system V.4
+changequote(,)dnl
+	i[34567]86-ncr-sysv4*)		# NCR 3000 - ix86 running system V.4
+changequote([,])dnl
 		xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
 		xm_defines="USG POSIX SMALL_ARG_MAX"
 		xmake_file=i386/x-ncr3000
-		if [[ x$stabs = xyes -a x$gas = xyes ]]
+		if test x$stabs = xyes -a x$gas = xyes
 		then
 			tm_file=i386/sysv4gdb.h
 		else
@@ -796,26 +812,32 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		tmake_file=i386/t-crtpic
 		;;
-	i[[34567]]86-next-*)
+changequote(,)dnl
+	i[34567]86-next-*)
+changequote([,])dnl
 		tm_file=i386/next.h
 		xm_file=i386/xm-next.h
 		tmake_file=i386/t-next
 		xmake_file=i386/x-next
 		extra_objs=nextstep.o
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='mach'
 		fi
 		;;
-	i[[34567]]86-sequent-bsd*) 		# 80386 from Sequent
+changequote(,)dnl
+	i[34567]86-sequent-bsd*) 		# 80386 from Sequent
+changequote([,])dnl
 		use_collect2=yes
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=i386/seq-gas.h
 		else
 			tm_file=i386/sequent.h
 		fi
 		;;
-	i[[34567]]86-sequent-ptx1*)
+changequote(,)dnl
+	i[34567]86-sequent-ptx1*)
+changequote([,])dnl
 		xm_defines="USG SVR3"
 		xmake_file=i386/x-sysv3
 		tm_file=i386/seq-sysv3.h
@@ -824,7 +846,9 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		install_headers_dir=install-headers-cpio
 		;;
-	i[[34567]]86-sequent-ptx2* | i[[34567]]86-sequent-sysv3*)
+changequote(,)dnl
+	i[34567]86-sequent-ptx2* | i[34567]86-sequent-sysv3*)
+changequote([,])dnl
 		xm_defines="USG SVR3"
 		xmake_file=i386/x-sysv3
 		tm_file=i386/seq2-sysv3.h
@@ -833,7 +857,9 @@ for machine in $build $host $target; do
 		fixincludes=fixinc.ptx
 		install_headers_dir=install-headers-cpio
 		;;
-	i[[34567]]86-sequent-ptx4* | i[[34567]]86-sequent-sysv4*)
+changequote(,)dnl
+	i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
+changequote([,])dnl
 		xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
 		xm_defines="USG POSIX SMALL_ARG_MAX"
 		xmake_file=x-svr4
@@ -848,25 +874,35 @@ for machine in $build $host $target; do
 		tm_file=i386/sun.h
 		use_collect2=yes
 		;;
-	i[[34567]]86-wrs-vxworks*)
+changequote(,)dnl
+	i[34567]86-wrs-vxworks*)
+changequote([,])dnl
 		tm_file=i386/vxi386.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[[34567]]86-*-aout*)
+changequote(,)dnl
+	i[34567]86-*-aout*)
+changequote([,])dnl
 		tm_file=i386/i386-aout.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[[34567]]86-*-bsdi* | i[[34567]]86-*-bsd386*)
+changequote(,)dnl
+	i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
+changequote([,])dnl
 		tm_file=i386/bsd386.h
 #		tmake_file=t-libc-ok
 		;;
-	i[[34567]]86-*-bsd*)
+changequote(,)dnl
+	i[34567]86-*-bsd*)
+changequote([,])dnl
 		tm_file=i386/386bsd.h
 #		tmake_file=t-libc-ok
 # Next line turned off because both 386BSD and BSD/386 use GNU ld.
 #		use_collect2=yes
 		;;
-	i[[34567]]86-*-freebsdelf*)
+changequote(,)dnl
+	i[34567]86-*-freebsdelf*)
+changequote([,])dnl
 		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 		# On FreeBSD, the headers are already ok, except for math.h.
 		fixincludes=fixinc.wrap
@@ -875,35 +911,45 @@ for machine in $build $host $target; do
 		gnu_ld=yes
 		stabs=yes
 		;;
-	i[[34567]]86-*-freebsd*)
+changequote(,)dnl
+	i[34567]86-*-freebsd*)
+changequote([,])dnl
 		tm_file=i386/freebsd.h
 		# On FreeBSD, the headers are already ok, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=i386/t-freebsd
 		;;
-	i[[34567]]86-*-netbsd*)
+changequote(,)dnl
+	i[34567]86-*-netbsd*)
+changequote([,])dnl
 		tm_file=i386/netbsd.h
 		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
 		;;
-	i[[34567]]86-*-coff*)
+changequote(,)dnl
+	i[34567]86-*-coff*)
+changequote([,])dnl
 		tm_file=i386/i386-coff.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[[34567]]86-*-isc*)		# 80386 running ISC system
+changequote(,)dnl
+	i[34567]86-*-isc*)		# 80386 running ISC system
+changequote([,])dnl
 		xm_file="${xm_file} i386/xm-isc.h"
 		xm_defines="USG SVR3"
 		case $machine in
-		  i[[34567]]86-*-isc[[34]]*)
+changequote(,)dnl
+		  i[34567]86-*-isc[34]*)
+changequote([,])dnl
 		    xmake_file=i386/x-isc3
 		    ;;
 		  *)
 		    xmake_file=i386/x-isc
 		    ;;
 		esac
-                if [[ x$gas = xyes -a x$stabs = xyes ]]
+                if test x$gas = xyes -a x$stabs = xyes
 		then
 			tm_file=i386/iscdbx.h
 			tmake_file=i386/t-svr3dbx
@@ -915,8 +961,9 @@ for machine in $build $host $target; do
 		fi
 		install_headers_dir=install-headers-cpio
 		;;
-	i[[34567]]86-*-linux-gnuoldld*)	# Intel 80386's running GNU/Linux
-					# with a.out format using
+changequote(,)dnl
+	i[34567]86-*-linux-gnuoldld*)	# Intel 80386's running GNU/Linux
+changequote([,])dnl			# with a.out format using
 					# pre BFD linkers
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
@@ -925,8 +972,9 @@ for machine in $build $host $target; do
 		gnu_ld=yes
 		float_format=i386
 		;;
-	i[[34567]]86-*-linux-gnuaout*)	# Intel 80386's running GNU/Linux
-					# with a.out format
+changequote(,)dnl
+	i[34567]86-*-linux-gnuaout*)	# Intel 80386's running GNU/Linux
+changequote([,])dnl			# with a.out format
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-aout.h
@@ -934,8 +982,9 @@ for machine in $build $host $target; do
 		gnu_ld=yes
 		float_format=i386
 		;;
-	i[[34567]]86-*-linux-gnulibc1)	# Intel 80386's running GNU/Linux
-					# with ELF format using the
+changequote(,)dnl
+	i[34567]86-*-linux-gnulibc1)	# Intel 80386's running GNU/Linux
+changequote([,])dnl			# with ELF format using the
 					# GNU/Linux C library 5
 		xmake_file=x-linux	
 		tm_file=i386/linux.h	
@@ -944,12 +993,13 @@ for machine in $build $host $target; do
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
  			thread_file='single'
  		fi
 		;;
-	i[[34567]]86-*-linux-gnu*)	# Intel 80386's running GNU/Linux
-					# with ELF format using glibc 2
+changequote(,)dnl
+	i[34567]86-*-linux-gnu*)	# Intel 80386's running GNU/Linux
+changequote([,])dnl			# with ELF format using glibc 2
 					# aka GNU/Linux C library 6
 		xmake_file=x-linux
 		tm_file=i386/linux.h
@@ -958,33 +1008,43 @@ for machine in $build $host $target; do
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
 		float_format=i386
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
  			thread_file='posix'
  		fi
 		;;
-	i[[34567]]86-*-gnu*)
+changequote(,)dnl
+	i[34567]86-*-gnu*)
+changequote([,])dnl
 		;;
-	i[[34567]]86-go32-msdos | i[[34567]]86-*-go32*)
+changequote(,)dnl
+	i[34567]86-go32-msdos | i[34567]86-*-go32*)
+changequote([,])dnl
 		xm_file=i386/xm-go32.h
 		tm_file=i386/go32.h
 		tmake_file=i386/t-go32
 		;;
-	i[[34567]]86-pc-msdosdjgpp*)
+changequote(,)dnl
+	i[34567]86-pc-msdosdjgpp*)
+changequote([,])dnl
 		xm_file=i386/xm-go32.h
 		tm_file=i386/go32.h
 		tmake_file=i386/t-go32
 		gnu_ld=yes
 		gas=yes
 		;;
-	i[[34567]]86-moss-msdos* | i[[34567]]86-*-moss*)
+changequote(,)dnl
+	i[34567]86-moss-msdos* | i[34567]86-*-moss*)
+changequote([,])dnl
 		tm_file=i386/moss.h
 		tmake_file=t-libc-ok
 		fixincludes=Makefile.in
 		gnu_ld=yes
 		gas=yes
 		;;
-	i[[34567]]86-*-lynxos*)
-		if [[ x$gas = xyes ]]
+changequote(,)dnl
+	i[34567]86-*-lynxos*)
+changequote([,])dnl
+		if test x$gas = xyes
 		then
 			tm_file=i386/lynx.h
 		else
@@ -994,13 +1054,17 @@ for machine in $build $host $target; do
 		tmake_file=i386/t-i386bare
 		xmake_file=x-lynx
 		;;
-	i[[34567]]86-*-mach*)
+changequote(,)dnl
+	i[34567]86-*-mach*)
+changequote([,])dnl
 		tm_file=i386/mach.h
 #		tmake_file=t-libc-ok
 		use_collect2=yes
 		;;
-	i[[34567]]86-*-osfrose*)		# 386 using OSF/rose
-                if [[ x$elf = xyes ]]
+changequote(,)dnl
+	i[34567]86-*-osfrose*)		# 386 using OSF/rose
+changequote([,])dnl
+                if test x$elf = xyes
 		then
 			tm_file=i386/osfelf.h
 			use_collect2=
@@ -1013,30 +1077,38 @@ for machine in $build $host $target; do
 		tmake_file=i386/t-osf
 		extra_objs=halfpic.o
 		;;
-	i[[34567]]86-go32-rtems*)
+changequote(,)dnl
+	i[34567]86-go32-rtems*)
+changequote([,])dnl
 		cpu_type=i386
 		xm_file=i386/xm-go32.h
 		tm_file=i386/go32-rtems.h
 		tmake_file="i386/t-go32 t-rtems"
 		;;
-	i[[34567]]86-*-rtemself*)
+changequote(,)dnl
+	i[34567]86-*-rtemself*)
+changequote([,])dnl
 		cpu_type=i386
 		tm_file=i386/rtemself.h
 		tmake_file="i386/t-i386bare t-rtems"
 		;;
-	i[[34567]]86-*-rtems*)
+changequote(,)dnl
+	i[34567]86-*-rtems*)
+changequote([,])dnl
 		cpu_type=i386
 		tm_file=i386/rtems.h
 		tmake_file="i386/t-i386bare t-rtems"
 		;;
-	i[[34567]]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
+changequote(,)dnl
+	i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
+changequote([,])dnl
 		xm_file="xm-siglist.h xm-alloca.h ${xm_file} i386/xm-sco5.h"
 		xm_defines="USG SVR3"
 		xmake_file=i386/x-sco5
 		fixincludes=fixinc.sco
 		install_headers_dir=install-headers-cpio
 		tm_file=i386/sco5.h
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="i386/sco5gas.h ${tm_file}"
 			tmake_file=i386/t-sco5gas
@@ -1045,13 +1117,15 @@ for machine in $build $host $target; do
 		fi
 		extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
 		;;
-	i[[34567]]86-*-sco3.2v4*) 	# 80386 running SCO 3.2v4 system
+changequote(,)dnl
+	i[34567]86-*-sco3.2v4*) 	# 80386 running SCO 3.2v4 system
+changequote([,])dnl
 		xm_file="${xm_file} i386/xm-sco.h"
 		xm_defines="USG SVR3 BROKEN_LDEXP SMALL_ARG_MAX NO_SYS_SIGLIST"
 		xmake_file=i386/x-sco4
 		fixincludes=fixinc.sco
 		install_headers_dir=install-headers-cpio
-                if [[ x$stabs = xyes ]]
+                if test x$stabs = xyes
 		then
 			tm_file=i386/sco4dbx.h
 			tmake_file=i386/t-svr3dbx
@@ -1063,11 +1137,13 @@ for machine in $build $host $target; do
 		fi
 		truncate_target=yes
 		;;
-	i[[34567]]86-*-sco*)	 	# 80386 running SCO system
+changequote(,)dnl
+	i[34567]86-*-sco*)	 	# 80386 running SCO system
+changequote([,])dnl
 		xm_file=i386/xm-sco.h
 		xmake_file=i386/x-sco
 		install_headers_dir=install-headers-cpio
-                if [[ x$stabs = xyes ]]
+                if test x$stabs = xyes
 		then
 			tm_file=i386/scodbx.h
 			tmake_file=i386/t-svr3dbx
@@ -1079,10 +1155,12 @@ for machine in $build $host $target; do
 		fi
 		truncate_target=yes
 		;;
-	i[[34567]]86-*-solaris2*)
+changequote(,)dnl
+	i[34567]86-*-solaris2*)
+changequote([,])dnl
 		xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
 		xm_defines="USG POSIX SMALL_ARG_MAX"
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file=i386/sol2dbg.h
 		else
@@ -1092,20 +1170,24 @@ for machine in $build $host $target; do
 		extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 		xmake_file=x-svr4
 		case $machine in
-		*-*-solaris2.[[0-4]])
+changequote(,)dnl
+		*-*-solaris2.[0-4])
+changequote([,])dnl
 			fixincludes=fixinc.svr4;;
 		*)
 			fixincludes=fixinc.wrap;;
 		esac
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='solaris'
 		fi
 		;;
-       i[[34567]]86-*-sysv5*)           # Intel x86 on System V Release 5
+changequote(,)dnl
+       i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
+changequote([,])dnl
                xm_file="xm-alloca.h xm-siglist.h ${xm_file}"
                xm_defines="USG POSIX"
                tm_file=i386/sysv4.h
-               if [[ x$stabs = xyes ]]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
@@ -1114,11 +1196,13 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtend.o"
                fixincludes=Makefile.in # The headers are just fine, thank you.
                ;;
-	i[[34567]]86-*-sysv4*)		# Intel 80386's running system V.4
+changequote(,)dnl
+	i[34567]86-*-sysv4*)		# Intel 80386's running system V.4
+changequote([,])dnl
 		xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
 		xm_defines="USG POSIX SMALL_ARG_MAX"
 		tm_file=i386/sysv4.h
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h"
 		fi
@@ -1126,12 +1210,14 @@ for machine in $build $host $target; do
 		xmake_file=x-svr4
 		extra_parts="crtbegin.o crtend.o"
 		;;
-	i[[34567]]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
+changequote(,)dnl
+	i[34567]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
+changequote([,])dnl
 		cpu_type=i386
 		xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h i386/xm-osf1elf.h"
 		xm_defines="USE_C_ALLOCA SMALL_ARG_MAX"
 		fixincludes=Makefile.in #Don't do it on OSF/1
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file=i386/osf1elfgdb.h
 		else
@@ -1141,12 +1227,14 @@ for machine in $build $host $target; do
 		xmake_file=i386/x-osf1elf
 		extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 		;;
-	i[[34567]]86-*-sysv*)		# Intel 80386's running system V
+changequote(,)dnl
+	i[34567]86-*-sysv*)		# Intel 80386's running system V
+changequote([,])dnl
 		xm_defines="USG SVR3"
 		xmake_file=i386/x-sysv3
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
-			if [[ x$stabs = xyes ]]
+			if test x$stabs = xyes
 			then
 				tm_file=i386/svr3dbx.h
 				tmake_file=i386/t-svr3dbx
@@ -1168,38 +1256,44 @@ for machine in $build $host $target; do
 		tmake_file=i386/t-vsta
 		xmake_file=i386/x-vsta
 		;;
-	i[[34567]]86-*-win32)
+changequote(,)dnl
+	i[34567]86-*-win32)
+changequote([,])dnl
 		xm_file="${xm_file} i386/xm-cygwin32.h"
 		tmake_file=i386/t-cygwin32
 		tm_file=i386/win32.h
 		xmake_file=i386/x-cygwin32
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		exeext=.exe
 		;;
-	i[[34567]]86-*-pe | i[[34567]]86-*-cygwin32)
+changequote(,)dnl
+	i[34567]86-*-pe | i[34567]86-*-cygwin32)
+changequote([,])dnl
 		xm_file="${xm_file} i386/xm-cygwin32.h"
 		tmake_file=i386/t-cygwin32
 		tm_file=i386/cygwin32.h
 		xmake_file=i386/x-cygwin32
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		exeext=.exe
 		;;
-	i[[34567]]86-*-mingw32*)
+changequote(,)dnl
+	i[34567]86-*-mingw32*)
+changequote([,])dnl
 		tm_file=i386/mingw32.h
 		xm_file="${xm_file} i386/xm-mingw32.h"
 		tmake_file="i386/t-cygwin32 i386/t-mingw32"
 		extra_objs=winnt.o
 		xmake_file=i386/x-cygwin32
 		fixincludes=Makefile.in
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		exeext=.exe
@@ -1211,7 +1305,9 @@ for machine in $build $host $target; do
 				;;
 		esac
 		;;
-	i[[34567]]86-*-winnt3*)
+changequote(,)dnl
+	i[34567]86-*-winnt3*)
+changequote([,])dnl
 		tm_file=i386/win-nt.h
 		out_file=i386/i386.c
 		xm_file="xm-winnt.h ${xm_file}"
@@ -1220,15 +1316,17 @@ for machine in $build $host $target; do
 		extra_host_objs="winnt.o oldnames.o"
 		extra_gcc_objs="spawnv.o oldnames.o"
 		fixincludes=fixinc.winnt
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			extra_programs=ld.exe
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		;;
-	i[[34567]]86-dg-dgux*)
+changequote(,)dnl
+	i[34567]86-dg-dgux*)
+changequote([,])dnl
 		xm_file="xm-alloca.h xm-siglist.h ${xm_file}"
 		xm_defines="USG POSIX"
 		out_file=i386/dgux.c
@@ -1247,7 +1345,7 @@ for machine in $build $host $target; do
 		;;
 	i860-*-bsd*)
 		tm_file="${tm_file} i860/bsd.h"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="${tm_file} i860/bsd-gas.h"
 		fi
@@ -1325,7 +1423,7 @@ for machine in $build $host $target; do
 	m68000-hp-hpux*)		# HP 9000 series 300
 		xm_file="xm_alloca.h ${xm_file}"
 		xm_defines="USG NO_SYS_SIGLIST"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			xmake_file=m68k/x-hp320g
 			tm_file=m68k/hp310g.h
@@ -1350,7 +1448,7 @@ for machine in $build $host $target; do
 	m68000-att-sysv*)
 		xm_file="m68k/xm-3b1.h ${xm_file}"
 		xm_defines=USG
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=m68k/3b1g.h
 		else
@@ -1366,13 +1464,13 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
 		tm_file=
-		if [[ "$gnu_ld" = yes ]]
+		if test "$gnu_ld" = yes
 		then
 			tm_file="${tm_file} m68k/auxgld.h"
 		else
 			tm_file="${tm_file} m68k/auxld.h"
 		fi
-		if [[ "$gas" = yes ]]
+		if test "$gas" = yes
 		then
 			tm_file="${tm_file} m68k/auxgas.h"
 		else
@@ -1389,7 +1487,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		;;
 	m68k-altos-sysv*)		   # Altos 3068
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 		        tm_file=m68k/altos3068.h
 			xm_defines=USG
@@ -1400,9 +1498,9 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 	        ;;
 	m68k-bull-sysv*)		# Bull DPX/2
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
-			if [[ x$stabs = xyes ]]
+			if test x$stabs = xyes
 			then
 				tm_file=m68k/dpx2cdbx.h
 			else
@@ -1430,10 +1528,10 @@ for machine in $build $host $target; do
 		tm_file=m68k/mot3300.h
 		xm_file="xm-alloca.h m68k/xm-mot3300.h ${xm_file}"
 		xm_defines=NO_SYS_SIGLIST
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			xmake_file=m68k/x-mot3300-gas
-			if [[ x$gnu_ld = xyes ]]
+			if test x$gnu_ld = xyes
 			then
 				tmake_file=m68k/t-mot3300-gald
 			else
@@ -1442,7 +1540,7 @@ for machine in $build $host $target; do
 			fi
 		else
 			xmake_file=m68k/x-mot3300
-			if [[ x$gnu_ld = xyes ]]
+			if test x$gnu_ld = xyes
 			then
 				tmake_file=m68k/t-mot3300-gld
 			else
@@ -1514,7 +1612,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		;;
 	m68k-isi-bsd*)
-		if [[ x$with_fp = xno ]]
+		if test x$with_fp = xno
 		then
 			tm_file=m68k/isi-nfp.h
 		else
@@ -1527,7 +1625,7 @@ for machine in $build $host $target; do
 	m68k-hp-hpux7*)	# HP 9000 series 300 running HPUX version 7.
 		xm_file="xm_alloca.h ${xm_file}"
 		xm_defines="USG NO_SYS_SIGLIST"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			xmake_file=m68k/x-hp320g
 			tm_file=m68k/hp320g.h
@@ -1543,7 +1641,7 @@ for machine in $build $host $target; do
 	m68k-hp-hpux*)	# HP 9000 series 300
 		xm_file="xm_alloca.h ${xm_file}"
 		xm_defines="USG NO_SYS_SIGLIST"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			xmake_file=m68k/x-hp320g
 			tm_file=m68k/hp320g.h
@@ -1563,7 +1661,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		;;
 	m68k-sony-newsos3*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=m68k/news3gas.h
 		else
@@ -1574,7 +1672,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		;;
 	m68k-sony-bsd* | m68k-sony-newsos*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=m68k/newsgas.h
 		else
@@ -1602,12 +1700,12 @@ for machine in $build $host $target; do
 		extra_objs=nextstep.o
 		extra_headers=math-68881.h
 		float_format=m68k
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='mach'
 		fi
 		;;
 	m68k-sun-sunos3*)
-		if [[ x$with_fp = xno ]]
+		if test x$with_fp = xno
 		then
 			tm_file=m68k/sun3n3.h
 		else
@@ -1618,7 +1716,7 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		;;
 	m68k-sun-sunos*)			# For SunOS 4 (the default).
-		if [[ x$with_fp = xno ]]
+		if test x$with_fp = xno
 		then
 			tm_file=m68k/sun3n.h
 		else
@@ -1648,7 +1746,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		;;
 	m68k-*-lynxos*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=m68k/lynx.h
 		else
@@ -1718,7 +1816,7 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		float_format=m68k
 		gnu_ld=yes
-		if [[ x$enable_threads = xyes ]]; then
+		if test x$enable_threads = xyes; then
 			thread_file='posix'
 		fi
 		;;
@@ -1748,7 +1846,7 @@ for machine in $build $host $target; do
 		esac
 		extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
 		xmake_file=m88k/x-dgux
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=m88k/t-dgux-gas
 		fi
@@ -1759,7 +1857,7 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		xm_file="m88k/xm-sysv3.h ${xm_file}"
 		xmake_file=m88k/x-dolph
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=m88k/t-m88k-gas
 		fi
@@ -1769,7 +1867,7 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		xm_file="m88k/xm-sysv3.h ${xm_file}"
 		xmake_file=m88k/x-tekXD88
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=m88k/t-m88k-gas
 		fi
@@ -1784,7 +1882,7 @@ for machine in $build $host $target; do
 	m88k-*-luna*)
 		tm_file=m88k/luna.h
 		extra_parts="crtbegin.o crtend.o"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=m88k/t-luna-gas
 		else
@@ -1796,7 +1894,7 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		xm_file="m88k/xm-sysv3.h ${xm_file}"
 		xmake_file=m88k/x-sysv3
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=m88k/t-m88k-gas
 		fi
@@ -1813,7 +1911,7 @@ for machine in $build $host $target; do
 		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris6
 		tmake_file=mips/t-iris6
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='irix'
 		fi
 		;;
@@ -1834,14 +1932,14 @@ for machine in $build $host $target; do
 		tmake_file=mips/t-cross64
 		# See comment in mips/iris[56].h files.
 		use_collect2=yes
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='irix'
 		fi
 		;;
         mips-sni-sysv4)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
-			if [[ x$stabs = xyes ]]
+			if test x$stabs = xyes
 			then
 				tm_file=mips/iris5gdb.h
 			else
@@ -1853,16 +1951,16 @@ for machine in $build $host $target; do
 		xm_defines=USG
                 xmake_file=mips/x-sni-svr4
                 tmake_file=mips/t-mips-gas
-                if [[ x$gnu_ld != xyes ]]
+                if test x$gnu_ld != xyes
                 then
                         use_collect2=yes
                 fi
                 ;;
 	mips-sgi-irix5*)		# SGI System V.4., IRIX 5
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file="mips/iris5.h mips/iris5gas.h"
-			if [[ x$stabs = xyes ]]
+			if test x$stabs = xyes
 			then
 				tm_file="${tm_file} dbx.h"
 			fi
@@ -1877,66 +1975,66 @@ for machine in $build $host $target; do
 		tmake_file=mips/t-mips-gas
 		# See comment in mips/iris5.h file.
 		use_collect2=yes
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='irix'
 		fi
 		;;
 	mips-sgi-irix4loser*)		# Mostly like a MIPS.
 		tm_file="mips/iris4loser.h mips/iris3.h ${tm_file} mips/iris4.h"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-iris
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='irix'
 		fi
 		;;
 	mips-sgi-irix4*)		# Mostly like a MIPS.
 		tm_file="mips/iris3.h ${tm_file} mips/iris4.h"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-iris
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='irix'
 		fi
 		;;
 	mips-sgi-*)			# Mostly like a MIPS.
 		tm_file="mips/iris3.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-iris3
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
@@ -1950,18 +2048,18 @@ for machine in $build $host $target; do
 		;;
 	mips-dec-osf*)			# Decstation running OSF/1 as shipped by DIGITAL
 		tm_file=mips/dec-osf1.h
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xmake_file=mips/x-dec-osf1
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			tmake_file=mips/t-ultrix
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
@@ -1969,14 +2067,14 @@ for machine in $build $host $target; do
 	mips-dec-bsd*)                  # Decstation running 4.4 BSD
               tm_file=mips/dec-bsd.h
               fixincludes=
-	      if [[ x$gas = xyes ]]
+	      if test x$gas = xyes
 	      then
 		   	tmake_file=mips/t-mips-gas
 	      else
 			tmake_file=mips/t-ultrix
 			extra_passes="mips-tfile mips-tdump"
 	      fi
-	      if [[ x$gnu_ld != xyes ]]
+	      if test x$gnu_ld != xyes
 	      then
 			use_collect2=yes
 	      fi
@@ -1990,16 +2088,16 @@ for machine in $build $host $target; do
 		;;
 	mips-sony-bsd* | mips-sony-newsos*)	# Sony NEWS 3600 or risc/news.
 		tm_file="mips/news4.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
@@ -2009,31 +2107,31 @@ for machine in $build $host $target; do
 					# That is based on svr4.
 		# t-svr4 is not right because this system doesn't use ELF.
 		tm_file="mips/news5.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file="xm-siglist.h ${xm_file}"
 		xm_defines=USG
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
 	mips-tandem-sysv4*)		# Tandem S2 running NonStop UX
 		tm_file="mips/svr4-5.h mips/svr4-t.h"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file="xm-siglist.h ${xm_file}"
 		xm_defines=USG
 		xmake_file=mips/x-sysv
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 			extra_parts="crtbegin.o crtend.o"
@@ -2041,151 +2139,163 @@ for machine in $build $host $target; do
 			tmake_file=mips/t-mips
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
 	mips-*-ultrix* | mips-dec-mach3)	# Decstation.
 		tm_file="mips/ultrix.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xmake_file=mips/x-ultrix
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			tmake_file=mips/t-ultrix
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 	        ;;
-	mips-*-riscos[[56789]]bsd*)
+changequote(,)dnl
+	mips-*-riscos[56789]bsd*)
+changequote([,])dnl
 		tm_file=mips/bsd-5.h	# MIPS BSD 4.3, RISC-OS 5.0
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-bsd-gas
 		else
 			tmake_file=mips/t-bsd
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 	        ;;
-	mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[[1234]]bsd*)
+changequote(,)dnl
+	mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[1234]bsd*)
+changequote([,])dnl
 		tm_file="mips/bsd-4.h ${tm_file}" # MIPS BSD 4.3, RISC-OS 4.0
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-bsd-gas
 		else
 			tmake_file=mips/t-bsd
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 	        ;;
-	mips-*-riscos[[56789]]sysv4*)
+changequote(,)dnl
+	mips-*-riscos[56789]sysv4*)
+changequote([,])dnl
 		tm_file=mips/svr4-5.h	# MIPS System V.4., RISC-OS 5.0
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file="xm-siglist.h ${xm_file}"
 		xmake_file=mips/x-sysv
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-svr4-gas
 		else
 			tmake_file=mips/t-svr4
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
-	mips-*-sysv4* | mips-*-riscos[[1234]]sysv4* | mips-*-riscossysv4*)
+changequote(,)dnl
+	mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4*)
+changequote([,])dnl
 		tm_file="mips/svr4-4.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-sysv
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-svr4-gas
 		else
 			tmake_file=mips/t-svr4
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
-	mips-*-riscos[[56789]]sysv*)
+changequote(,)dnl
+	mips-*-riscos[56789]sysv*)
+changequote([,])dnl
 		tm_file=mips/svr3-5.h	# MIPS System V.3, RISC-OS 5.0
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-sysv
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-svr3-gas
 		else
 			tmake_file=mips/t-svr3
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
 	mips-*-sysv* | mips-*-riscos*sysv*)
 		tm_file="mips/svr3-4.h ${tm_file}"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_defines=USG
 		xmake_file=mips/x-sysv
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-svr3-gas
 		else
 			tmake_file=mips/t-svr3
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
 		;;
-	mips-*-riscos[[56789]]*)		# Default MIPS RISC-OS 5.0.
+changequote(,)dnl
+	mips-*-riscos[56789]*)		# Default MIPS RISC-OS 5.0.
+changequote([,])dnl
 		tm_file=mips/mips-5.h
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
@@ -2194,14 +2304,14 @@ for machine in $build $host $target; do
 		;;
 	mipsel-*-ecoff*)
 		tm_file=mips/ecoffl.h
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		tmake_file=mips/t-ecoff
 		;;
 	mips-*-ecoff*)
 		tm_file="gofast.h mips/ecoff.h"
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
 		tmake_file=mips/t-ecoff
@@ -2245,16 +2355,16 @@ for machine in $build $host $target; do
 		use_collect2=yes
 		;;
 	mips-*-*)				# Default MIPS RISC-OS 4.0.
-		if [[ x$stabs = xyes ]]; then
+		if test x$stabs = xyes; then
 			tm_file="${tm_file} dbx.h"
 		fi
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file=mips/t-mips-gas
 		else
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		if [[ x$gnu_ld != xyes ]]
+		if test x$gnu_ld != xyes
 		then
 			use_collect2=yes
 		fi
@@ -2262,7 +2372,7 @@ for machine in $build $host $target; do
 	mn10200-*-*)
 		cpu_type=mn10200
 		tm_file="mn10200/mn10200.h"
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h"
 		fi
@@ -2271,7 +2381,7 @@ for machine in $build $host $target; do
 	mn10300-*-*)
 		cpu_type=mn10300
 		tm_file="mn10300/mn10300.h"
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h"
 		fi
@@ -2350,7 +2460,7 @@ for machine in $build $host $target; do
 		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
 		extra_headers=ppc-asm.h
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		else
@@ -2372,7 +2482,7 @@ for machine in $build $host $target; do
 		;;
 	powerpc-*-eabi*)
 		tm_file=rs6000/eabi.h
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 		else
@@ -2383,7 +2493,7 @@ for machine in $build $host $target; do
 		;;
 	powerpc-*-rtems*)
 		tm_file=rs6000/rtems.h
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 		     tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 		else
@@ -2396,7 +2506,7 @@ for machine in $build $host $target; do
 		tm_file=rs6000/linux.h
 		xm_file=rs6000/xm-sysv4.h
 		out_file=rs6000/rs6000.c
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
 		else
@@ -2406,7 +2516,7 @@ for machine in $build $host $target; do
 		fixincludes=Makefile.in
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
-		if [[ x$enable_threads = xyes ]]; then
+		if test x$enable_threads = xyes; then
 			thread_file='posix'
 		fi
 		;;
@@ -2415,7 +2525,7 @@ for machine in $build $host $target; do
 		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
 		xm_defines="USG ${xm_defines}"
 		out_file=rs6000/rs6000.c
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
 		else
@@ -2425,7 +2535,7 @@ for machine in $build $host $target; do
 		fixincludes=Makefile.in
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		extra_headers=ppc-asm.h
-		if [[ x$enable_threads = xyes ]]; then
+		if test x$enable_threads = xyes; then
 			thread_file='posix'
 		fi
 		;;
@@ -2442,7 +2552,7 @@ for machine in $build $host $target; do
 		tm_file=rs6000/sysv4le.h
 		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		else
@@ -2459,7 +2569,7 @@ for machine in $build $host $target; do
 		;;
 	powerpcle-*-eabi*)
 		tm_file=rs6000/eabile.h
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 		else
@@ -2473,7 +2583,7 @@ for machine in $build $host $target; do
                 tmake_file=rs6000/t-winnt
 #               extra_objs=pe.o
 		fixincludes=Makefile.in
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		extra_headers=ppc-asm.h
@@ -2485,7 +2595,7 @@ for machine in $build $host $target; do
 		xmake_file=rs6000/x-cygwin32
 #		extra_objs=pe.o
 		fixincludes=Makefile.in
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
 			thread_file='win32'
 		fi
 		exeext=.exe
@@ -2495,7 +2605,7 @@ for machine in $build $host $target; do
 		tm_file=rs6000/sol2.h
 		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
 		xm_defines="USG POSIX"
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 		else
@@ -2503,21 +2613,27 @@ for machine in $build $host $target; do
 		fi
 		xmake_file=rs6000/x-sysv4
 		case $machine in
-		*-*-solaris2.[[0-4]])
+changequote(,)dnl
+		*-*-solaris2.[0-4])
+changequote([,])dnl
 			fixincludes=fixinc.svr4;;
 		*)
 			fixincludes=fixinc.wrap;;
 		esac
 		extra_headers=ppc-asm.h
 		;;
-	rs6000-ibm-aix3.[[01]]*)
+changequote(,)dnl
+	rs6000-ibm-aix3.[01]*)
+changequote([,])dnl
 		tm_file=rs6000/aix31.h
 		xmake_file=rs6000/x-aix31
 		use_collect2=yes
 		;;
-	rs6000-ibm-aix3.2.[[456789]]* | powerpc-ibm-aix3.2.[[456789]]*)
+changequote(,)dnl
+	rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
+changequote([,])dnl
 		tm_file=rs6000/aix3newas.h
-		if [[ x$host != x$target ]]
+		if test x$host != x$target
 		then
 			tmake_file=rs6000/t-xnewas
 		else
@@ -2525,9 +2641,11 @@ for machine in $build $host $target; do
 		fi
 		use_collect2=yes
 		;;
-	rs6000-ibm-aix4.[[12]].* | powerpc-ibm-aix4.[[12]].*)
+changequote(,)dnl
+	rs6000-ibm-aix4.[12].* | powerpc-ibm-aix4.[12].*)
+changequote([,])dnl
 		tm_file=rs6000/aix41.h
-		if [[ x$host != x$target ]]
+		if test x$host != x$target
 		then
 			tmake_file=rs6000/t-xnewas
 		else
@@ -2536,9 +2654,11 @@ for machine in $build $host $target; do
 		xmake_file=rs6000/x-aix41
 		use_collect2=yes
 		;;
-	rs6000-ibm-aix4.[[3456789]].* | powerpc-ibm-aix4.[[3456789]].*)
+changequote(,)dnl
+	rs6000-ibm-aix4.[3456789].* | powerpc-ibm-aix4.[3456789].*)
+changequote([,])dnl
 		tm_file=rs6000/aix43.h
-		if [[ x$host != x$target ]]
+		if test x$host != x$target
 		then
 			tmake_file=rs6000/t-xaix43
 		else
@@ -2547,9 +2667,11 @@ for machine in $build $host $target; do
 		xmake_file=rs6000/x-aix43
 		use_collect2=yes
 		;;
-	rs6000-ibm-aix[[56789]].* | powerpc-ibm-aix[[56789]].*)
+changequote(,)dnl
+	rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
+changequote([,])dnl
 		tm_file=rs6000/aix43.h
-		if [[ x$host != x$target ]]
+		if test x$host != x$target
 		then
 			tmake_file=rs6000/t-xaix43
 		else
@@ -2650,12 +2772,12 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		gnu_ld=yes
- 		if [[ x$enable_threads = xyes ]]; then
+ 		if test x$enable_threads = xyes; then
  			thread_file='posix'
  		fi
 		;;
 	sparc-*-lynxos*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			tm_file=sparc/lynx.h
 		else
@@ -2670,7 +2792,7 @@ for machine in $build $host $target; do
 		tm_file=sparc/rtems.h
 		;;
 	sparc-*-solaris2*)
-		if [[ x$gnu_ld = xyes ]]
+		if test x$gnu_ld = xyes
 		then
 			tm_file=sparc/sol2.h
 		else
@@ -2682,20 +2804,22 @@ for machine in $build $host $target; do
 		xmake_file=sparc/x-sysv4
 		extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
 		case $machine in
-		*-*-solaris2.[[0-4]])
+changequote(,)dnl
+		*-*-solaris2.[0-4])
+changequote([,])dnl
 			fixincludes=fixinc.svr4;;
 		*)
 			fixincludes=fixinc.wrap;;
 		esac
 		float_format=i128
-		if [[ x${enable_threads} = x ]]; then
+		if test x${enable_threads} = x; then
 		    enable_threads=$have_pthread_h
-		    if [[ x${enable_threads} = x ]]; then
+		    if test x${enable_threads} = x; then
 			enable_threads=$have_thread_h
 		    fi
 		fi
-		if [[ x${enable_threads} = xyes ]]; then
-		    if [[ x${have_pthread_h} = xyes ]]; then
+		if test x${enable_threads} = xyes; then
+		    if test x${have_pthread_h} = xyes; then
 			thread_file='posix'
 		    else
 			thread_file='solaris'
@@ -2711,7 +2835,7 @@ for machine in $build $host $target; do
 		tm_file=sparc/sunos4.h
 		tmake_file=sparc/t-sunos41
 		use_collect2=yes
-		if [[ x$gas = xyes ]]; then
+		if test x$gas = xyes; then
 			tm_file="${tm_file} sparc/sun4gas.h"
 		fi
 		;;
@@ -2787,7 +2911,7 @@ for machine in $build $host $target; do
 		tm_file="v850/v850.h"
 		xm_file="v850/xm-v850.h"
 		tmake_file=v850/t-v850
-		if [[ x$stabs = xyes ]]
+		if test x$stabs = xyes
 		then
 			tm_file="${tm_file} dbx.h"
 		fi
@@ -2893,9 +3017,9 @@ for machine in $build $host $target; do
 				;;
 		esac
 				
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
-			if [[ "$target_cpu_default2" = "" ]]
+			if test "$target_cpu_default2" = ""
 			then
 				target_cpu_default2="MASK_GAS"
 			else
@@ -2925,7 +3049,7 @@ for machine in $build $host $target; do
 				;;
 
 			*)
-				if [[ x$pass2done = xyes ]]
+				if test x$pass2done = xyes
 				then
 					echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
 					exit 1
@@ -2935,9 +3059,9 @@ for machine in $build $host $target; do
 		;;
 
 	mips*-*-ecoff* | mips*-*-elf*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
-			if [[ x$gnu_ld = xyes ]]
+			if test x$gnu_ld = xyes
 			then
 				target_cpu_default2=20
 			else
@@ -2946,7 +3070,7 @@ for machine in $build $host $target; do
 		fi
 		;;
 	mips*-*-*)
-		if [[ x$gas = xyes ]]
+		if test x$gas = xyes
 		then
 			target_cpu_default2=16
 		fi
@@ -2969,7 +3093,7 @@ for machine in $build $host $target; do
 				;;
 
 			*)
-				if [[ x$pass2done = xyes ]]
+				if test x$pass2done = xyes
 				then
 					echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
 					exit 1
@@ -2986,7 +3110,7 @@ for machine in $build $host $target; do
 				target_cpu_default2="TARGET_CPU_$with_cpu"
 				;;
 			*)
-				if [[ x$pass2done = xyes ]]
+				if test x$pass2done = xyes
 				then
 					echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
 					exit 1
@@ -2996,9 +3120,9 @@ for machine in $build $host $target; do
 		;;
 	esac
 
-	if [[ "$target_cpu_default2" != "" ]]
+	if test "$target_cpu_default2" != ""
 	then
-		if [[ "$target_cpu_default" != "" ]]
+		if test "$target_cpu_default" != ""
 		then
 			target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
 		else
@@ -3017,9 +3141,9 @@ for machine in $build $host $target; do
 
 # Save data on machine being used to compile GCC in build_xm_file.
 # Save data on host machine in vars host_xm_file and host_xmake_file.
-	if [[ x$pass1done = x ]]
+	if test x$pass1done = x
 	then
-		if [[ x"$xm_file" = x ]]
+		if test x"$xm_file" = x
 		then build_xm_file=$cpu_type/xm-$cpu_type.h
 		else build_xm_file=$xm_file
 		fi
@@ -3028,14 +3152,14 @@ for machine in $build $host $target; do
 		build_exeext=$exeext
 		pass1done=yes
 	else
-		if [[ x$pass2done = x ]]
+		if test x$pass2done = x
 		then
-			if [[ x"$xm_file" = x ]]
+			if test x"$xm_file" = x
 			then host_xm_file=$cpu_type/xm-$cpu_type.h
 			else host_xm_file=$xm_file
 			fi
 			host_xm_defines=$xm_defines
-			if [[ x"$xmake_file" = x ]]
+			if test x"$xmake_file" = x
 			then xmake_file=$cpu_type/x-$cpu_type
 			fi
 			host_xmake_file="$xmake_file"
@@ -3051,30 +3175,30 @@ done
 extra_objs="${host_extra_objs} ${extra_objs}"
 
 # Default the target-machine variables that were not explicitly set.
-if [[ x"$tm_file" = x ]]
+if test x"$tm_file" = x
 then tm_file=$cpu_type/$cpu_type.h; fi
 
-if [[ x$extra_headers = x ]]
+if test x$extra_headers = x
 then extra_headers=; fi
 
-if [[ x"$xm_file" = x ]]
+if test x"$xm_file" = x
 then xm_file=$cpu_type/xm-$cpu_type.h; fi
 
-if [[ x$md_file = x ]]
+if test x$md_file = x
 then md_file=$cpu_type/$cpu_type.md; fi
 
-if [[ x$out_file = x ]]
+if test x$out_file = x
 then out_file=$cpu_type/$cpu_type.c; fi
 
-if [[ x"$tmake_file" = x ]]
+if test x"$tmake_file" = x
 then tmake_file=$cpu_type/t-$cpu_type
 fi
 
-if [[ x$float_format = x ]]
+if test x$float_format = x
 then float_format=i64
 fi
 
-if [[ x$enable_haifa = x ]]
+if test x$enable_haifa = x
 then
   case $target in
     alpha*-* | hppa1.?-* | powerpc*-* | rs6000-* | *sparc*-* | m32r*-*)
@@ -3090,7 +3214,7 @@ count=a
 for f in $tm_file; do
 	count=${count}x
 done
-if [[ $count = ax ]]; then
+if test $count = ax; then
 	echo "Using \`$srcdir/config/$tm_file' as target machine macro file."
 else
 	echo "Using the following target machine macro files:"
@@ -3103,7 +3227,7 @@ count=a
 for f in $host_xm_file; do
 	count=${count}x
 done
-if [[ $count = ax ]]; then
+if test $count = ax; then
 	echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file."
 else
 	echo "Using the following host machine macro files:"
@@ -3112,12 +3236,12 @@ else
 	done
 fi
 
-if [[ "$host_xm_file" != "$build_xm_file" ]]; then
+if test "$host_xm_file" != "$build_xm_file"; then
 	count=a
 	for f in $build_xm_file; do
 		count=${count}x
 	done
-	if [[ $count = ax ]]; then
+	if test $count = ax; then
 		echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file."
 	else
 		echo "Using the following build machine macro files:"
@@ -3127,8 +3251,8 @@ if [[ "$host_xm_file" != "$build_xm_file" ]]; then
 	fi
 fi
 
-if [[ x$thread_file = x ]]; then
-	if [[ x$target_thread_file != x ]]; then
+if test x$thread_file = x; then
+	if test x$target_thread_file != x; then
 		thread_file=$target_thread_file
 	else
 		thread_file='single'
@@ -3146,7 +3270,7 @@ host_xm_file="auto-host.h ${host_xm_file}"
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
-if [[ x$host = x$build ]]
+if test x$host = x$build
 then
 	build_xm_file="auto-host.h ${build_xm_file}"
 else
@@ -3178,10 +3302,10 @@ links="config.h tm.h tconfig.h hconfig.h"
 defines="host_xm_defines null_defines xm_defines build_xm_defines"
 
 rm -f config.bak
-if [[ -f config.status ]]; then mv -f config.status config.bak; fi
+if test -f config.status; then mv -f config.status config.bak; fi
 
 # Make the links.
-while [[ -n "$vars" ]]
+while test -n "$vars"
 do
 	set $vars; var=$1; shift; vars=$*
 	set $links; link=$1; shift; links=$*
@@ -3191,7 +3315,7 @@ do
 
 	# Define TARGET_CPU_DEFAULT if the system wants one.
 	# This substitutes for lots of *.h files.
-	if [[ "$target_cpu_default" != "" -a $link = tm.h ]]
+	if test "$target_cpu_default" != "" -a $link = tm.h
 	then
 		echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
 	fi
@@ -3208,17 +3332,19 @@ do
 done
 
 # Truncate the target if necessary
-if [[ x$host_truncate_target != x ]]; then
+if test x$host_truncate_target != x; then
 	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
 # Get the version trigger filename from the toplevel
-if [[ "${with_gcc_version_trigger+set}" = set ]]; then
+if test "${with_gcc_version_trigger+set}" = set; then
 	gcc_version_trigger=$with_gcc_version_trigger
 else
 	gcc_version_trigger=${srcdir}/version.c
 fi
-gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${gcc_version_trigger}`
+changequote(,)dnl
+gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+changequote([,])dnl
 
 # Get an absolute path to the GCC top-level source directory
 holddir=`pwd`
@@ -3233,7 +3359,7 @@ host_overrides=Make-host
 dep_host_xmake_file=
 for f in .. ${host_xmake_file}
 do
-	if [[ -f ${srcdir}/config/$f ]]
+	if test -f ${srcdir}/config/$f
 	then
 		dep_host_xmake_file="${dep_host_xmake_file} ${srcdir}/config/$f"
 	fi
@@ -3246,7 +3372,7 @@ target_overrides=Make-target
 dep_tmake_file=
 for f in .. ${tmake_file}
 do
-	if [[ -f ${srcdir}/config/$f ]]
+	if test -f ${srcdir}/config/$f
 	then
 		dep_tmake_file="${dep_tmake_file} ${srcdir}/config/$f"
 	fi
@@ -3307,7 +3433,7 @@ done
 # Also use all.cross instead of all.internal
 # and add cross-make to Makefile.
 cross_overrides="/dev/null"
-if [[ x$host != x$target ]]
+if test x$host != x$target
 then
 	cross_defines="CROSS=-DCROSS_COMPILE"
 	cross_overrides="${topdir}/cross-make"
@@ -3317,7 +3443,7 @@ fi
 # This must come after cross-make as we want all.build to override
 # all.cross.
 build_overrides="/dev/null"
-if [[ x$build != x$host ]]
+if test x$build != x$host
 then
 	build_overrides="${topdir}/build-make"
 fi
@@ -3325,7 +3451,7 @@ fi
 # Expand extra_headers to include complete path.
 # This substitutes for lots of t-* files.
 extra_headers_list=
-if [[ "x$extra_headers" = x ]]
+if test "x$extra_headers" = x
 then true
 else
 	# Prepend ${srcdir}/ginclude/ to every entry in extra_headers.
@@ -3335,14 +3461,14 @@ else
 	done
 fi
 
-if [[ x$use_collect2 = xno ]]; then
+if test x$use_collect2 = xno; then
 	use_collect2=
 fi
 
 # Add a definition of USE_COLLECT2 if system wants one.
 # Also tell toplev.c what to do.
 # This substitutes for lots of t-* files.
-if [[ x$use_collect2 = x ]]
+if test x$use_collect2 = x
 then
 	will_use_collect2=
 	maybe_use_collect2=
@@ -3358,7 +3484,7 @@ fi
 # building gcc with a cross compiler, use the cross compiler just
 # built.  Otherwise, we can use the cpp just built.
 md_file_sub=
-if [[ "x$md_cppflags" = x ]]
+if test "x$md_cppflags" = x
 then
 	md_file_sub=$srcdir/config/$md_file
 else
@@ -3366,18 +3492,18 @@ else
 fi
 
 # If we have gas in the build tree, make a link to it.
-if [[ -f ../gas/Makefile ]]; then
+if test -f ../gas/Makefile; then
 	rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null
 fi
 
 # If we have nm in the build tree, make a link to it.
-if [[ -f ../binutils/Makefile ]]; then
+if test -f ../binutils/Makefile; then
 	rm -f nm; $symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null
 fi
 
 # If we have ld in the build tree, make a link to it.
-if [[ -f ../ld/Makefile ]]; then
-#	if [[ x$use_collect2 = x ]]; then
+if test -f ../ld/Makefile; then
+#	if test x$use_collect2 = x; then
 #		rm -f ld; $symbolic_link ../ld/ld-new$host_exeext ld$host_exeext 2>/dev/null
 #	else
 		rm -f collect-ld; $symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext 2>/dev/null
@@ -3389,39 +3515,43 @@ AC_MSG_CHECKING(assembler alignment features)
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,gcc$,gas,'`
-if [[ -x as$host_exeext ]]; then
+if test -x as$host_exeext; then
 	# Build using assembler in the current directory.
 	gcc_cv_as=./as$host_exeext
-elif [[ -f $gcc_cv_as_gas_srcdir/configure.in ]]; then
+elif test -f $gcc_cv_as_gas_srcdir/configure.in; then
 	# Single tree build which includes gas.
 	for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
 	do
-		gcc_cv_gas_version=`grep '^VERSION=[[0-9]]*\.[[0-9]]*' $f`
-		if [[ x$gcc_cv_gas_version != x ]]; then
+changequote(,)dnl
+		gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+changequote([,])dnl
+		if test x$gcc_cv_gas_version != x; then
 			break
 		fi
 	done
-	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"`
-	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"`
-	if [[ x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x ]]; then
+changequote(,)dnl
+	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
+	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
+changequote([,])dnl
+	if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
 		# Gas version 2.6 and later support for .balign and .p2align.
 		# bytes to skip when using .p2align.
-		if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
+		if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2; then
 			gcc_cv_as_alignment_features=".balign and .p2align"
 			AC_DEFINE(HAVE_GAS_BALIGN_AND_P2ALIGN)
 		fi
 		# Gas version 2.8 and later support specifying the maximum
 		# bytes to skip when using .p2align.
-		if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
+		if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2; then
 			gcc_cv_as_alignment_features=".p2align including maximum skip"
 			AC_DEFINE(HAVE_GAS_MAX_SKIP_P2ALIGN)
 		fi
 	fi
-elif [[ x$host = x$target ]]; then
+elif test x$host = x$target; then
 	# Native build.
 	gcc_cv_as=as$host_exeext
 fi
-if [[ x$gcc_cv_as != x ]]; then
+if test x$gcc_cv_as != x; then
 	# Check if we have .balign and .p2align
 	echo ".balign  4" > conftest.s
 	echo ".p2align  2" >> conftest.s
@@ -3449,14 +3579,16 @@ do
 	..) ;;
 	# The odd quoting in the next line works around
 	# an apparent bug in bash 1.12 on linux.
-	${srcdir}/[[*]]/config-lang.in) ;;
-	*) subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([[^/]]*\)/config-lang.in$,\1,'`" ;;
+changequote(,)dnl
+	${srcdir}/[*]/config-lang.in) ;;
+	*) subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;;
+changequote([,])dnl
 	esac
 done
 
 # Make gthr-default.h if we have a thread file.
 gthread_flags=
-if [[ $thread_file != single ]]; then
+if test $thread_file != single; then
     rm -f gthr-default.h
     echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h
     gthread_flags=-DHAVE_GTHR_DEFAULT
@@ -3472,11 +3604,11 @@ rm -f specs.h options.h
 touch specs.h options.h
 for subdir in . $subdirs
 do
-	if [[ -f $srcdir/$subdir/lang-specs.h ]]; then
+	if test -f $srcdir/$subdir/lang-specs.h; then
 		echo "#include \"$subdir/lang-specs.h\"" >>specs.h
 		lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
 	fi
-	if [[ -f $srcdir/$subdir/lang-options.h ]]; then
+	if test -f $srcdir/$subdir/lang-options.h; then
 		echo "#include \"$subdir/lang-options.h\"" >>options.h
 		lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h"
 	fi
@@ -3508,7 +3640,7 @@ oldstyle_subdirs=
 
 for s in .. $subdirs
 do
-	if [[ $s != ".." ]]
+	if test $s != ".."
 	then
 		language=
 		boot_language=
@@ -3519,14 +3651,14 @@ do
 		outputs=
 		lib2funcs=
 		. ${srcdir}/$s/config-lang.in
-		if [[ "x$language" = x ]]
+		if test "x$language" = x
 		then
 			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
 			exit 1
 		fi
 		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in ${srcdir}/$s/Makefile.in"
 		all_languages="$all_languages $language"
-		if [[ "x$boot_language" = xyes ]]
+		if test "x$boot_language" = xyes
 		then
 			all_boot_languages="$all_boot_languages $language"
 		fi
@@ -3535,7 +3667,7 @@ do
 		all_diff_excludes="$all_diff_excludes $diff_excludes"
 		all_headers="$all_headers $headers"
 		all_outputs="$all_outputs $outputs"
-		if [[ x$outputs = x ]]
+		if test x$outputs = x
 		then
 			oldstyle_subdirs="$oldstyle_subdirs $s"
 		fi
@@ -3559,7 +3691,7 @@ do
 	x=
 	for l in .. $all_languages
 	do
-		if [[ $l != ".." ]]; then
+		if test $l != ".."; then
 			x="$x $l.$t"
 		fi
 	done
@@ -3568,14 +3700,14 @@ done
 
 # If we're not building in srcdir, create .gdbinit.
 
-if [[ ! -f Makefile.in ]]; then
+if test ! -f Makefile.in; then
 	echo "dir ." > .gdbinit
 	echo "dir ${srcdir}" >> .gdbinit
-	if [[ x$gdb_needs_out_file_path = xyes ]]
+	if test x$gdb_needs_out_file_path = xyes
 	then
 		echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
 	fi
-	if [[ "x$subdirs" != x ]]; then
+	if test "x$subdirs" != x; then
 		for s in $subdirs
 		do
 			echo "dir ${srcdir}/$s" >> .gdbinit
@@ -3589,7 +3721,7 @@ fi
 build_canonical=${build}
 host_canonical=${host}
 target_subdir=
-if [[ "${host}" != "${target}" ]] ; then
+if test "${host}" != "${target}" ; then
     target_subdir=${target}/
 fi
 AC_SUBST(build_canonical)
@@ -3601,7 +3733,7 @@ AC_SUBST(target_subdir)
 # libgcc.a, but that's OK because newib should have its own version of
 # assert.h.
 inhibit_libc=
-if [[ x$with_newlib = xyes ]]; then
+if test x$with_newlib = xyes; then
 	inhibit_libc=-Dinhibit_libc
 fi
 AC_SUBST(inhibit_libc)
@@ -3609,17 +3741,17 @@ AC_SUBST(inhibit_libc)
 # Override SCHED_OBJ and SCHED_CFLAGS to enable the Haifa scheduler.
 sched_prefix=
 sched_cflags=
-if [[ x$enable_haifa = xyes ]]; then
+if test x$enable_haifa = xyes; then
     echo "Using the Haifa scheduler."
     sched_prefix=haifa-
     sched_cflags=-DHAIFA
 fi
 AC_SUBST(sched_prefix)
 AC_SUBST(sched_cflags)
-if [[ x$enable_haifa != x ]]; then
+if test x$enable_haifa != x; then
     # Explicitly remove files that need to be recompiled for the Haifa scheduler.
     for x in genattrtab.o toplev.o loop.o unroll.o *sched.o; do
-	if [[ -f $x ]]; then
+	if test -f $x; then
 	    echo "Removing $x"
 	    rm -f $x
 	fi
@@ -3628,7 +3760,7 @@ fi
 
 # Warn if using init_priority.
 AC_MSG_CHECKING(whether to enable init_priority by default)
-if [[ x$enable_init_priority != xyes ]]; then
+if test x$enable_init_priority != xyes; then
   enable_init_priority=no
 fi
 AC_MSG_RESULT($enable_init_priority)
@@ -3697,7 +3829,7 @@ AC_SUBST_FILE(language_fragments)
 AC_SUBST_FILE(language_hooks)
 
 # Echo that links are built
-if [[ x$host = x$target ]]
+if test x$host = x$target
 then
 	str1="native "
 else
@@ -3705,25 +3837,25 @@ else
 	str2=" from $host"
 fi
 
-if [[ x$host != x$build ]]
+if test x$host != x$build
 then
 	str3=" on a $build system"
 fi
 
-if [[ "x$str2" != x ]] || [[ "x$str3" != x ]]
+if test "x$str2" != x || test "x$str3" != x
 then
 	str4=
 fi
 
 echo "Links are now set up to build a ${str1}compiler for ${target}$str4" 1>&2
 
-if [[ "x$str2" != x ]] || [[ "x$str3" != x ]]
+if test "x$str2" != x || test "x$str3" != x
 then
 	echo " ${str2}${str3}." 1>&2
 fi
 
 # Truncate the target if necessary
-if [[ x$host_truncate_target != x ]]; then
+if test x$host_truncate_target != x; then
 	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
@@ -3745,9 +3877,9 @@ esac
 # FLAGS_TO_PASS has been modified to solve the problem there.
 # This is virtually a duplicate of what happens in configure.lang; we do
 # an extra check to make sure this only happens if ln -s can be used.
-if [[ "$symbolic_link" = "ln -s" ]]; then
+if test "$symbolic_link" = "ln -s"; then
  for d in .. ${subdirs} ; do
-   if [[ $d != .. ]]; then
+   if test $d != ..; then
 	STARTDIR=`pwd`
 	cd $d
 	for t in stage1 stage2 stage3 stage4 include