From f24b370adf4963aea649dba366855ebbdcd5e3ed Mon Sep 17 00:00:00 2001
From: Mike Meissner <meissner@cygnus.com>
Date: Mon, 18 Aug 1997 22:03:38 +0000
Subject: [PATCH] Fix --with-cpu=xxx

From-SVN: r14837
---
 gcc/ChangeLog    |  6 +++++
 gcc/configure    | 70 +-----------------------------------------------
 gcc/configure.in |  2 +-
 3 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 240877048e42..d58e871d3ff6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 18 17:39:02 1997  Mike Meissner  <meissner@cygnus.com>
+
+	* configure.in ({powerpc,rs6000}*-*-*, --with-cpu): Remove single
+	quotes around the name.
+	* configure: Regenerate.
+
 Mon Aug 18 13:46:47 1997  Jim Wilson  <wilson@cygnus.com>
 
 	* Makefile.in (stmp-multilib-sub): Fix typo in last change.
diff --git a/gcc/configure b/gcc/configure
index 6b2f3a9e6b61..0db313f2d55d 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1480,7 +1480,6 @@ objext='.o'
 
 
 build_xm_file=
-build_broken_install=
 build_install_headers_dir=install-headers-tar
 build_exeext=
 host_xm_file=
@@ -1508,8 +1507,6 @@ for machine in $build $host $target; do
 	use_collect2=
 	# Set this to override the default target model.
 	target_cpu_default=
-	# Set this to force use of install.sh.
-	broken_install=
 	# Set this to control which fixincludes program to use.
 	fixincludes=fixincludes
 	# Set this to control how the header file directory is installed.
@@ -1632,7 +1629,6 @@ for machine in $build $host $target; do
 		then
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		broken_install=yes
 		use_collect2=yes
 		# Some versions of OSF4 (specifically X4.0-9 296.7) have
 		# a broken tar, so we use cpio instead.
@@ -1652,7 +1648,6 @@ for machine in $build $host $target; do
 		then
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		broken_install=yes
 		use_collect2=yes
 		;;
 	alpha*-dec-osf1.2)
@@ -1665,7 +1660,6 @@ for machine in $build $host $target; do
 		then
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		broken_install=yes
 		use_collect2=yes
 		;;
 	alpha*-*-osf*)
@@ -1677,7 +1671,6 @@ for machine in $build $host $target; do
 		then
 			extra_passes="mips-tfile mips-tdump"
 		fi
-		broken_install=yes
 		use_collect2=yes
 		;;
 	alpha*-*-winnt3*)
@@ -1747,7 +1740,6 @@ for machine in $build $host $target; do
 		tm_file=arm/linux-gas.h
 		tmake_file=arm/t-linux
 		fixincludes=Makefile.in
-		broken_install=yes
 		gnu_ld=yes
 		;;
 	arm-*-aout)
@@ -1785,7 +1777,6 @@ for machine in $build $host $target; do
 		extra_headers=va-clipper.h
 		extra_parts="crtbegin.o crtend.o"
 		install_headers_dir=install-headers-cpio
-		broken_install=yes
 		;;
 	dsp16xx-*)
 		;;
@@ -1836,7 +1827,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1850,7 +1840,6 @@ for machine in $build $host $target; do
 		else
 			tm_file="pa/pa-oldas.h ${tm_file}"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1865,7 +1854,6 @@ for machine in $build $host $target; do
 		else
 			tm_file="pa/pa-oldas.h ${tm_file}"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1878,7 +1866,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1890,7 +1877,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1903,7 +1889,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1915,7 +1900,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1928,7 +1912,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1940,7 +1923,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1953,7 +1935,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1965,7 +1946,6 @@ for machine in $build $host $target; do
 		then
 			tm_file="${tm_file} pa/pa-gas.h"
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
@@ -1988,7 +1968,6 @@ for machine in $build $host $target; do
 		fi
 		xm_file=i386/xm-aix.h
 		xmake_file=i386/x-aix
-		broken_install=yes
 		;;
 	i486-ncr-sysv4*)		# NCR 3000 - i486 running system V.4
 		xm_file=i386/xm-sysv4.h
@@ -2029,7 +2008,6 @@ for machine in $build $host $target; do
 		fixincludes=fixinc.ptx
 		extra_parts="crtbegin.o crtend.o"
 		install_headers_dir=install-headers-cpio
-		broken_install=yes
 		;;
 	i[3456]86-sequent-ptx2* | i[3456]86-sequent-sysv3*)
 		xm_file=i386/xm-sysv3.h
@@ -2039,7 +2017,6 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		fixincludes=fixinc.ptx
 		install_headers_dir=install-headers-cpio
-		broken_install=yes
 		;;
 	i[3456]86-sequent-ptx4* | i[3456]86-sequent-sysv4*)
 		xm_file=i386/xm-sysv4.h
@@ -2049,7 +2026,6 @@ for machine in $build $host $target; do
 		extra_parts="crtbegin.o crtend.o"
 		fixincludes=fixinc.ptx
 		install_headers_dir=install-headers-cpio
-		broken_install=yes
 		;;
 	i386-sun-sunos*)		# Sun i386 roadrunner
 		xm_file=i386/xm-sun.h
@@ -2121,7 +2097,6 @@ for machine in $build $host $target; do
 			extra_parts="crtbegin.o crtend.o"
 		fi
 		install_headers_dir=install-headers-cpio
-		broken_install=yes
 		;;
 	i[3456]86-*-linux-gnuoldld*)	# Intel 80386's running Linux
 		xm_file=i386/xm-linux.h # with a.out format using pre BFD linkers
@@ -2129,7 +2104,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-oldld.h
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
 		;;
 	i[3456]86-*-linux-gnuaout*)		# Intel 80386's running Linux
@@ -2138,7 +2112,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-aout.h
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
 		;;
 	i[3456]86-*-linux-gnulibc1)
@@ -2148,7 +2121,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
  		if [ x$enable_threads = xyes ]; then
  			thread_file='single'
@@ -2161,7 +2133,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux i386/t-crtstuff"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
  		if [ x$enable_threads = xyes ]; then
  			thread_file='posix'
@@ -2226,7 +2197,6 @@ for machine in $build $host $target; do
 		xm_file=i386/xm-sco5.h
 		xmake_file=i386/x-sco5
 		fixincludes=fixinc.sco
-		broken_install=yes
 		tm_file=i386/sco5.h
 		tmake_file=i386/t-sco5
 		extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
@@ -2235,7 +2205,6 @@ for machine in $build $host $target; do
 		xm_file=i386/xm-sco.h
 		xmake_file=i386/x-sco4
 		fixincludes=fixinc.sco
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
                 if [ x$stabs = xyes ]
 		then
@@ -2252,7 +2221,6 @@ for machine in $build $host $target; do
 	i[3456]86-*-sco*)	 	# 80386 running SCO system
 		xm_file=i386/xm-sco.h
 		xmake_file=i386/x-sco
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
                 if [ x$stabs = xyes ]
 		then
@@ -2278,7 +2246,6 @@ for machine in $build $host $target; do
 		extra_parts="crt1.o crti.o crtn.o crtbegin.o crtend.o"
 		xmake_file=x-svr4
 		fixincludes=fixinc.svr4
-		broken_install=yes
  		if [ x$enable_threads = xyes ]; then
 			thread_file='solaris'
 		fi
@@ -2394,7 +2361,6 @@ for machine in $build $host $target; do
 		tm_file="${tm_file} svr3.h i860/paragon.h"
 		xm_file="${xm_file} xm-svr3.h"
 		tmake_file=t-osf
-		broken_install=yes
 		;;
 	i860-*-sysv3*)
 		tm_file="${tm_file} svr3.h i860/sysv3.h"
@@ -2462,7 +2428,6 @@ for machine in $build $host $target; do
 			xmake_file=m68k/x-hp320
 			tm_file=m68k/hp310.h
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		extra_headers=math-68881.h
@@ -2491,7 +2456,6 @@ for machine in $build $host $target; do
 	m68k-apple-aux*)		# Apple Macintosh running A/UX
 		xm_file=m68k/xm-aux.h
 		tmake_file=m68k/t-aux
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		extra_headers=math-68881.h
 		extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
@@ -2600,7 +2564,6 @@ for machine in $build $host $target; do
 		xm_file=m68k/xm-crds.h
 		xmake_file=m68k/x-crds
 		tm_file=m68k/crds.h
-		broken_install=yes
 		use_collect2=yes
 		extra_headers=math-68881.h
 		;;
@@ -2617,7 +2580,6 @@ for machine in $build $host $target; do
 		xmake_file=m68k/x-ccur
 		extra_headers=math-68881.h
 		use_collect2=yes
-		broken_install=yes
 		;;
 	m68k-hp-bsd4.4*)		# HP 9000/3xx running 4.4bsd
 		tm_file=m68k/hp3bsd44.h
@@ -2650,7 +2612,6 @@ for machine in $build $host $target; do
 			xmake_file=m68k/x-hp320
 			tm_file=m68k/hpux7.h
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		extra_headers=math-68881.h
@@ -2665,7 +2626,6 @@ for machine in $build $host $target; do
 			xmake_file=m68k/x-hp320
 			tm_file=m68k/hp320.h
 		fi
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		extra_headers=math-68881.h
@@ -2838,7 +2798,6 @@ for machine in $build $host $target; do
 		    ;;
 		esac
 		extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
-		broken_install=yes
 		xmake_file=m88k/x-dgux
 		if [ x$gas = xyes ]
 		then
@@ -2902,7 +2861,6 @@ for machine in $build $host $target; do
 	mips-sgi-irix6*)		# SGI System V.4., IRIX 6
 		tm_file=mips/iris6.h
 		xm_file=mips/xm-iris6.h
-		broken_install=yes
 		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris6
 		tmake_file=mips/t-iris6
@@ -2913,7 +2871,6 @@ for machine in $build $host $target; do
 	mips-sgi-irix5cross64)		# Irix5 host, Irix 6 target, cross64
 		tm_file=mips/cross64.h
 		xm_file=mips/xm-iris5.h
-		broken_install=yes
 		fixincludes=Makefile.in
 		xmake_file=mips/x-iris
 		tmake_file=mips/t-cross64
@@ -2942,7 +2899,6 @@ for machine in $build $host $target; do
                 then
                         use_collect2=yes
                 fi
-                broken_install=yes
                 ;;
 	mips-sgi-irix5*)		# SGI System V.4., IRIX 5
 		if [ x$gas = xyes ]
@@ -2956,7 +2912,6 @@ for machine in $build $host $target; do
 			tm_file=mips/iris5.h
 		fi
 		xm_file=mips/xm-iris5.h
-		broken_install=yes
 		fixincludes=fixinc.irix
 		xmake_file=mips/x-iris
 		# mips-tfile doesn't work yet
@@ -2973,7 +2928,6 @@ for machine in $build $host $target; do
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file=mips/xm-iris4.h
-		broken_install=yes
 		xmake_file=mips/x-iris
 		if [ x$gas = xyes ]
 		then
@@ -2995,7 +2949,6 @@ for machine in $build $host $target; do
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file=mips/xm-iris4.h
-		broken_install=yes
 		xmake_file=mips/x-iris
 		if [ x$gas = xyes ]
 		then
@@ -3017,7 +2970,6 @@ for machine in $build $host $target; do
 			tm_file="${tm_file} dbx.h"
 		fi
 		xm_file=mips/xm-iris3.h
-		broken_install=yes
 		xmake_file=mips/x-iris3
 		if [ x$gas = xyes ]
 		then
@@ -3136,7 +3088,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-ultrix* | mips-dec-mach3)	# Decstation.
 		tm_file=mips/ultrix.h
@@ -3172,7 +3123,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 	        ;;
 	mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[1234]bsd*)
 		tm_file=mips/bsd-4.h	# MIPS BSD 4.3, RISC-OS 4.0
@@ -3190,7 +3140,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 	        ;;
 	mips-*-riscos[56789]sysv4*)
 		tm_file=mips/svr4-5.h	# MIPS System V.4., RISC-OS 5.0
@@ -3210,7 +3159,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4*)
 		tm_file=mips/svr4-4.h	# MIPS System V.4. RISC-OS 4.0
@@ -3230,7 +3178,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-riscos[56789]sysv*)
 		tm_file=mips/svr3-5.h	# MIPS System V.3, RISC-OS 5.0
@@ -3250,7 +3197,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-sysv* | mips-*-riscos*sysv*)
 		tm_file=mips/svr3-4.h	# MIPS System V.3, RISC-OS 4.0
@@ -3270,7 +3216,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-riscos[56789]*)		# Default MIPS RISC-OS 5.0.
 		tm_file=mips/mips-5.h
@@ -3287,7 +3232,6 @@ for machine in $build $host $target; do
 		then
 			use_collect2=yes
 		fi
-		broken_install=yes
 		;;
 	mips-*-gnu*)
 		;;
@@ -3304,7 +3248,6 @@ for machine in $build $host $target; do
 			tm_file="${tm_file} dbx.h"
 		fi
 		tmake_file=mips/t-ecoff
-		broken_install=yes
 		;;
 	mipsel-*-elf*)
 		tm_file="mips/elfl.h libgloss.h"
@@ -3377,12 +3320,10 @@ for machine in $build $host $target; do
 		;;
 	ns32k-tek6100-bsd*)
 		tm_file=ns32k/tek6100.h
-		broken_install=yes
 		use_collect2=yes
 		;;
 	ns32k-tek6200-bsd*)
 		tm_file=ns32k/tek6200.h
-		broken_install=yes
 		use_collect2=yes
 		;;
 # This has not been updated to GCC 2.
@@ -3390,7 +3331,6 @@ for machine in $build $host $target; do
 #		xm_file=ns32k/xm-genix.h
 #		xmake_file=ns32k/x-genix
 #		tm_file=ns32k/genix.h
-#		broken_install=yes
 #		use_collect2=yes
 #		;;
 	ns32k-merlin-*)
@@ -3646,7 +3586,6 @@ for machine in $build $host $target; do
 		tm_file=sparc/linux-aout.h
 		xmake_file=x-linux
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
 		;;
 	sparc-*-linux-gnulibc1*)		 # Sparc's running Linux
@@ -3656,7 +3595,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux t-linux-gnulibc1 sparc/t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
 		;;
 	sparc-*-linux-gnu*)			 # Sparc's running Linux
@@ -3666,7 +3604,6 @@ for machine in $build $host $target; do
 		tmake_file="t-linux sparc/t-linux"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
-		broken_install=yes
 		gnu_ld=yes
  		if [ x$enable_threads = xyes ]; then
  			thread_file='posix'
@@ -3694,7 +3631,6 @@ 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"
 		fixincludes=fixinc.svr4
-		broken_install=yes
  		if [ x$enable_threads = xyes ]; then
 			thread_file='solaris'
 		fi
@@ -3821,11 +3757,9 @@ for machine in $build $host $target; do
 	*-*-sysv4*)
 		fixincludes=fixinc.svr4
 		xmake_try_sysv=x-sysv
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		;;
 	*-*-sysv*)
-		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		;;
 	esac
@@ -3890,7 +3824,7 @@ for machine in $build $host $target; do
 			  | xrios1 | xrios2 | xrsc | xrsc1 \
 			  | x601 | x602 | x603 | x603e | x604 | x604e | x620 \
 			  | x403 | x505 | x801 | x821 | x823 | x860)
-				target_cpu_default2="'\"$with_cpu\"'"
+				target_cpu_default2="\"$with_cpu\""
 				;;
 
 			xyes | xno)
@@ -3945,7 +3879,6 @@ for machine in $build $host $target; do
 		then build_xm_file=$cpu_type/xm-$cpu_type.h
 		else build_xm_file=$xm_file
 		fi
-		build_broken_install=$broken_install
 		build_install_headers_dir=$install_headers_dir
 		build_exeext=$exeext
 		pass1done=yes
@@ -4908,7 +4841,6 @@ build_install_headers_dir='${build_install_headers_dir}'
 build_exeext='${build_exeext}'
 gdb_needs_out_file_path='${gdb_needs_out_file_path}'
 SET_MAKE='${SET_MAKE}'
-build_broken_install='${build_broken_install}'
 target_list='${target_list}'
 target_overrides='${target_overrides}'
 host_overrides='${host_overrides}'
diff --git a/gcc/configure.in b/gcc/configure.in
index fc0b56bd5b94..562d3e48bc67 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2490,7 +2490,7 @@ for machine in $build $host $target; do
 			  | xrios1 | xrios2 | xrsc | xrsc1 \
 			  | x601 | x602 | x603 | x603e | x604 | x604e | x620 \
 			  | x403 | x505 | x801 | x821 | x823 | x860)
-				target_cpu_default2="'\"$with_cpu\"'"
+				target_cpu_default2="\"$with_cpu\""
 				;;
 
 			xyes | xno)
-- 
GitLab