top level:

	* configure: Make enable_threads and enable_shared defaults
	explicit.  Substitute enable_threads into generated Makefiles.
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	* libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*.
gcc:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	* fixinc/inclhack.def: Likewise.
	* fixinc/mkfixinc.sh: Likewise.
	* configure: Regenerate.
	* fixinc/fixincl.x: Regenerate.
	* install.texi: Document equivalence of linux and linux-gnu.
libio:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	Honor --disable-threads.
libstdc++:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	Honor --disable-threads.
libstdc++-v3:
	* configure: Regenerate after change to ../libtool.m4.
libobjc:
	* configure: Regenerate after change to ../libtool.m4.

From-SVN: r35680

7 files changed, 82 insertions, 64 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0cab5b..16bd605 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
+	* fixinc/inclhack.def: Likewise.
+	* fixinc/mkfixinc.sh: Likewise. 
+	* configure: Regenerate.
+	* fixinc/fixincl.x: Regenerate.
+	* install.texi: Document equivalence of linux and linux-gnu.
+
 Mon Aug 14 18:51:44 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* cse.c (insert_regs): Also in REG case: When finding an invalid
diff --git a/gcc/configure b/gcc/configure
index cc64ac5..fe38ab5 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1484,7 +1484,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:1491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -1514,7 +1514,7 @@ esac
 
 
 # Find some useful tools
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk 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
@@ -3754,9 +3754,9 @@ for machine in $build $host $target; do
 		;;
 	esac	
 
-	# Common parts for linux-gnu and openbsd systems
+	# Common parts for linux and openbsd systems
 	case $machine in
-	*-*-linux-gnu*)
+	*-*-linux*)
 		xm_defines="HAVE_ATEXIT POSIX BSTRING"
 		;;
 	*-*-openbsd*)
@@ -3831,7 +3831,7 @@ for machine in $build $host $target; do
 		#prefix='$$INTERIX_ROOT'/usr/contrib
 		#local_prefix='$$INTERIX_ROOT'/usr/contrib
 		;;
-	alpha*-*-linux-gnuecoff*)
+	alpha*-*-linux*ecoff*)
 		tm_file="${tm_file} alpha/linux-ecoff.h alpha/linux.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-alpha alpha/t-ieee"
@@ -3839,7 +3839,7 @@ for machine in $build $host $target; do
 		xmake_file=none
 		gas=yes gnu_ld=yes
 		;;
-	alpha*-*-linux-gnulibc1*)
+	alpha*-*-linux*libc1*)
 		tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="t-linux t-linux-gnulibc1 alpha/t-alpha alpha/t-crtbe alpha/t-ieee"
@@ -3850,7 +3850,7 @@ for machine in $build $host $target; do
  			thread_file='posix'
  		fi
 		;;
-	alpha*-*-linux-gnu*)
+	alpha*-*-linux*)
 		tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="t-linux alpha/t-crtbe alpha/t-alpha alpha/t-ieee"
@@ -3980,14 +3980,14 @@ for machine in $build $host $target; do
 		tmake_file="t-netbsd arm/t-netbsd"
 		use_collect2=yes
 		;;
-	arm*-*-linux-gnuaout*)		# ARM GNU/Linux with a.out
+	arm*-*-linux*aout*)		# ARM GNU/Linux with a.out
 		cpu_type=arm
 		xmake_file=x-linux
 		tm_file=arm/linux-aout.h
 		tmake_file=arm/t-linux
 		gnu_ld=yes
 		;;
-	arm*-*-linux-gnuoldld*)		# ARM GNU/Linux with old ELF linker
+	arm*-*-linux*oldld*)		# ARM GNU/Linux with old ELF linker
 		xm_file=arm/xm-linux.h
 		xmake_file=x-linux
 		tm_file="arm/linux-oldld.h arm/linux-elf.h"
@@ -4005,7 +4005,7 @@ for machine in $build $host $target; do
 			;;
 		esac
 		;;
-	arm*-*-linux-gnu*)		# ARM GNU/Linux with ELF
+	arm*-*-linux*)		# ARM GNU/Linux with ELF
 		xm_file=arm/xm-linux.h
 		xmake_file=x-linux
 		tm_file="arm/linux-elf.h"
@@ -4567,7 +4567,7 @@ for machine in $build $host $target; do
 		tmake_file="$tmake_file i386/t-i386bare"
 		install_headers_dir=install-headers-cpio
 		;;
-	i[34567]86-*-linux-gnuoldld*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*oldld*)	# Intel 80386's running GNU/Linux
 					# pre BFD linkers
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
@@ -4575,14 +4575,14 @@ for machine in $build $host $target; do
 		gnu_ld=yes
 		float_format=i386
 		;;
-	i[34567]86-*-linux-gnuaout*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*aout*)	# Intel 80386's running GNU/Linux
 		xmake_file=x-linux-aout
 		tmake_file="t-linux-aout i386/t-crtstuff"
 		tm_file=i386/linux-aout.h
 		gnu_ld=yes
 		float_format=i386
 		;;
-	i[34567]86-*-linux-gnulibc1)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*libc1)	# Intel 80386's running GNU/Linux
 					# GNU/Linux C library 5
 		xmake_file=x-linux	
 		tm_file=i386/linux.h	
@@ -4594,7 +4594,7 @@ for machine in $build $host $target; do
  			thread_file='single'
  		fi
 		;;
-	i[34567]86-*-linux-gnu*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*)	# Intel 80386's running GNU/Linux
 					# aka GNU/Linux C library 6
 		xmake_file=x-linux
 		tm_file=i386/linux.h
@@ -5405,7 +5405,7 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		float_format=m68k
 		;;
-	m68k-*-linux-gnuaout*)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*aout*)		# Motorola m68k's running GNU/Linux
 					# with a.out format
 		xmake_file=x-linux
 		tm_file=m68k/linux-aout.h
@@ -5414,7 +5414,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		gnu_ld=yes
 		;;
-	m68k-*-linux-gnulibc1)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*libc1)		# Motorola m68k's running GNU/Linux
 					# with ELF format using the
 					# GNU/Linux C library 5
 		xmake_file=x-linux
@@ -5425,7 +5425,7 @@ for machine in $build $host $target; do
 		float_format=m68k
 		gnu_ld=yes
 		;;
-	m68k-*-linux-gnu*)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*)		# Motorola m68k's running GNU/Linux
 					# with ELF format using glibc 2
 					# aka the GNU/Linux C library 6.
 		xmake_file=x-linux
@@ -6150,7 +6150,7 @@ for machine in $build $host $target; do
 		tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		;;
-	powerpc-*-linux-gnulibc1)
+	powerpc-*-linux*libc1)
 		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file=rs6000/xm-sysv4.h
 		out_file=rs6000/rs6000.c
@@ -6161,7 +6161,7 @@ for machine in $build $host $target; do
 			thread_file='posix'
 		fi
 		;;
-	powerpc-*-linux-gnu*)
+	powerpc-*-linux*)
 		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG ${xm_defines}"
@@ -6343,13 +6343,13 @@ for machine in $build $host $target; do
 		#float_format=i128
 		float_format=i64
 		;;
-	sparc-*-linux-gnuaout*)		# Sparc's running GNU/Linux, a.out
+	sparc-*-linux*aout*)		# Sparc's running GNU/Linux, a.out
 		xm_file="${xm_file} sparc/xm-linux.h"
 		tm_file=sparc/linux-aout.h
 		xmake_file=x-linux
 		gnu_ld=yes
 		;;
-	sparc-*-linux-gnulibc1*)	# Sparc's running GNU/Linux, libc5
+	sparc-*-linux*libc1*)	# Sparc's running GNU/Linux, libc5
 		xm_file="${xm_file} sparc/xm-linux.h"
 		xmake_file=x-linux
 		tm_file=sparc/linux.h
@@ -6358,7 +6358,7 @@ for machine in $build $host $target; do
 		gnu_ld=yes
 		float_format=sparc
 		;;
-	sparc-*-linux-gnu*)		# Sparc's running GNU/Linux, libc6
+	sparc-*-linux*)		# Sparc's running GNU/Linux, libc6
 		xm_file="${xm_file} sparc/xm-linux.h"
 		xmake_file=x-linux
 		tm_file=sparc/linux.h
@@ -6648,7 +6648,7 @@ for machine in $build $host $target; do
 	esac
 
 	case $machine in
-	*-*-linux-gnu*)
+	*-*-linux*)
 	        ;; # Existing GNU/Linux systems do not use the GNU setup.
 	*-*-gnu*)
 		# On the GNU system, the setup is just about the same on
@@ -7157,7 +7157,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -7298,7 +7298,7 @@ else
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-char *p = alloca(2 * sizeof(int));
+void *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 if { (eval echo configure:7305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/gcc/configure.in b/gcc/configure.in
index 8265303..ed68e89 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -656,9 +656,9 @@ changequote([,])dnl
 		;;
 	esac	
 
-	# Common parts for linux-gnu and openbsd systems
+	# Common parts for linux and openbsd systems
 	case $machine in
-	*-*-linux-gnu*)
+	*-*-linux*)
 		xm_defines="HAVE_ATEXIT POSIX BSTRING"
 		;;
 	*-*-openbsd*)
@@ -733,7 +733,7 @@ changequote([,])dnl
 		#prefix='$$INTERIX_ROOT'/usr/contrib
 		#local_prefix='$$INTERIX_ROOT'/usr/contrib
 		;;
-	alpha*-*-linux-gnuecoff*)
+	alpha*-*-linux*ecoff*)
 		tm_file="${tm_file} alpha/linux-ecoff.h alpha/linux.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-alpha alpha/t-ieee"
@@ -741,7 +741,7 @@ changequote([,])dnl
 		xmake_file=none
 		gas=yes gnu_ld=yes
 		;;
-	alpha*-*-linux-gnulibc1*)
+	alpha*-*-linux*libc1*)
 		tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="t-linux t-linux-gnulibc1 alpha/t-alpha alpha/t-crtbe alpha/t-ieee"
@@ -752,7 +752,7 @@ changequote([,])dnl
  			thread_file='posix'
  		fi
 		;;
-	alpha*-*-linux-gnu*)
+	alpha*-*-linux*)
 		tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
 		target_cpu_default="MASK_GAS"
 		tmake_file="t-linux alpha/t-crtbe alpha/t-alpha alpha/t-ieee"
@@ -888,14 +888,14 @@ changequote([,])dnl
 		tmake_file="t-netbsd arm/t-netbsd"
 		use_collect2=yes
 		;;
-	arm*-*-linux-gnuaout*)		# ARM GNU/Linux with a.out
+	arm*-*-linux*aout*)		# ARM GNU/Linux with a.out
 		cpu_type=arm
 		xmake_file=x-linux
 		tm_file=arm/linux-aout.h
 		tmake_file=arm/t-linux
 		gnu_ld=yes
 		;;
-	arm*-*-linux-gnuoldld*)		# ARM GNU/Linux with old ELF linker
+	arm*-*-linux*oldld*)		# ARM GNU/Linux with old ELF linker
 		xm_file=arm/xm-linux.h
 		xmake_file=x-linux
 		tm_file="arm/linux-oldld.h arm/linux-elf.h"
@@ -913,7 +913,7 @@ changequote([,])dnl
 			;;
 		esac
 		;;
-	arm*-*-linux-gnu*)		# ARM GNU/Linux with ELF
+	arm*-*-linux*)		# ARM GNU/Linux with ELF
 		xm_file=arm/xm-linux.h
 		xmake_file=x-linux
 		tm_file="arm/linux-elf.h"
@@ -1520,7 +1520,7 @@ changequote([,])dnl
 		install_headers_dir=install-headers-cpio
 		;;
 changequote(,)dnl
-	i[34567]86-*-linux-gnuoldld*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*oldld*)	# Intel 80386's running GNU/Linux
 changequote([,])dnl			# with a.out format using
 					# pre BFD linkers
 		xmake_file=x-linux-aout
@@ -1530,7 +1530,7 @@ changequote([,])dnl			# with a.out format using
 		float_format=i386
 		;;
 changequote(,)dnl
-	i[34567]86-*-linux-gnuaout*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*aout*)	# 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"
@@ -1539,7 +1539,7 @@ changequote([,])dnl			# with a.out format
 		float_format=i386
 		;;
 changequote(,)dnl
-	i[34567]86-*-linux-gnulibc1)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*libc1)	# Intel 80386's running GNU/Linux
 changequote([,])dnl			# with ELF format using the
 					# GNU/Linux C library 5
 		xmake_file=x-linux	
@@ -1553,7 +1553,7 @@ changequote([,])dnl			# with ELF format using the
  		fi
 		;;
 changequote(,)dnl
-	i[34567]86-*-linux-gnu*)	# Intel 80386's running GNU/Linux
+	i[34567]86-*-linux*)	# Intel 80386's running GNU/Linux
 changequote([,])dnl			# with ELF format using glibc 2
 					# aka GNU/Linux C library 6
 		xmake_file=x-linux
@@ -2419,7 +2419,7 @@ changequote([,])dnl
 		extra_headers=math-68881.h
 		float_format=m68k
 		;;
-	m68k-*-linux-gnuaout*)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*aout*)		# Motorola m68k's running GNU/Linux
 					# with a.out format
 		xmake_file=x-linux
 		tm_file=m68k/linux-aout.h
@@ -2428,7 +2428,7 @@ changequote([,])dnl
 		float_format=m68k
 		gnu_ld=yes
 		;;
-	m68k-*-linux-gnulibc1)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*libc1)		# Motorola m68k's running GNU/Linux
 					# with ELF format using the
 					# GNU/Linux C library 5
 		xmake_file=x-linux
@@ -2439,7 +2439,7 @@ changequote([,])dnl
 		float_format=m68k
 		gnu_ld=yes
 		;;
-	m68k-*-linux-gnu*)		# Motorola m68k's running GNU/Linux
+	m68k-*-linux*)		# Motorola m68k's running GNU/Linux
 					# with ELF format using glibc 2
 					# aka the GNU/Linux C library 6.
 		xmake_file=x-linux
@@ -3176,7 +3176,7 @@ changequote([,])dnl
 		tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 		extra_headers=ppc-asm.h
 		;;
-	powerpc-*-linux-gnulibc1)
+	powerpc-*-linux*libc1)
 		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file=rs6000/xm-sysv4.h
 		out_file=rs6000/rs6000.c
@@ -3187,7 +3187,7 @@ changequote([,])dnl
 			thread_file='posix'
 		fi
 		;;
-	powerpc-*-linux-gnu*)
+	powerpc-*-linux*)
 		tm_file="rs6000/sysv4.h rs6000/linux.h"
 		xm_file="rs6000/xm-sysv4.h"
 		xm_defines="USG ${xm_defines}"
@@ -3379,13 +3379,13 @@ changequote([,])dnl
 		#float_format=i128
 		float_format=i64
 		;;
-	sparc-*-linux-gnuaout*)		# Sparc's running GNU/Linux, a.out
+	sparc-*-linux*aout*)		# Sparc's running GNU/Linux, a.out
 		xm_file="${xm_file} sparc/xm-linux.h"
 		tm_file=sparc/linux-aout.h
 		xmake_file=x-linux
 		gnu_ld=yes
 		;;
-	sparc-*-linux-gnulibc1*)	# Sparc's running GNU/Linux, libc5
+	sparc-*-linux*libc1*)	# Sparc's running GNU/Linux, libc5
 		xm_file="${xm_file} sparc/xm-linux.h"
 		xmake_file=x-linux
 		tm_file=sparc/linux.h
@@ -3394,7 +3394,7 @@ changequote([,])dnl
 		gnu_ld=yes
 		float_format=sparc
 		;;
-	sparc-*-linux-gnu*)		# Sparc's running GNU/Linux, libc6
+	sparc-*-linux*)		# Sparc's running GNU/Linux, libc6
 		xm_file="${xm_file} sparc/xm-linux.h"
 		xmake_file=x-linux
 		tm_file=sparc/linux.h
@@ -3690,7 +3690,7 @@ changequote([,])dnl
 	esac
 
 	case $machine in
-	*-*-linux-gnu*)
+	*-*-linux*)
 	        ;; # Existing GNU/Linux systems do not use the GNU setup.
 	*-*-gnu*)
 		# On the GNU system, the setup is just about the same on
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 8ad11e2..14c697f 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -331,7 +331,7 @@ tSCC zAab_Fd_Zero_Asm_Posix_Types_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Asm_Posix_Types_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 
 /*
@@ -387,7 +387,7 @@ tSCC zAab_Fd_Zero_Gnu_Types_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Gnu_Types_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 #define AAB_FD_ZERO_GNU_TYPES_H_TEST_CT  0
 #define aAab_Fd_Zero_Gnu_Types_HTests   (tTestDesc*)NULL
@@ -434,7 +434,7 @@ tSCC zAab_Fd_Zero_Selectbits_HList[] =
  *  Machine/OS name selection pattern
  */
 tSCC* apzAab_Fd_Zero_Selectbits_HMachs[] = {
-        "i[34567]86-*-linux-gnu*",
+        "i[34567]86-*-linux*",
         (const char*)NULL };
 #define AAB_FD_ZERO_SELECTBITS_H_TEST_CT  0
 #define aAab_Fd_Zero_Selectbits_HTests   (tTestDesc*)NULL
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 44a9842..b1172d7 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -163,7 +163,7 @@ typedef char * va_list;
 fix = {
     hackname = AAB_fd_zero_asm_posix_types_h;
     files    = asm/posix_types.h;
-    mach     = 'i[34567]86-*-linux-gnu*';
+    mach     = 'i[34567]86-*-linux*';
     bypass   = '} while';
 
     /*
@@ -204,7 +204,7 @@ fix = {
 fix = {
     hackname = AAB_fd_zero_gnu_types_h;
     files    = gnu/types.h;
-    mach     = 'i[34567]86-*-linux-gnu*';
+    mach     = 'i[34567]86-*-linux*';
 
     /*
      * Define _TYPES_H_WRAPPER at the end of the wrapper, not
@@ -243,7 +243,7 @@ fix = {
 fix = {
     hackname = AAB_fd_zero_selectbits_h;
     files    = selectbits.h;
-    mach     = 'i[34567]86-*-linux-gnu*';
+    mach     = 'i[34567]86-*-linux*';
 
     /*
      * Define _SELECTBITS_H_WRAPPER at the end of the wrapper, not
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index c01d808..058c163 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -13,7 +13,7 @@ echo constructing ${target} for $machine
 fixincludes="${machine}"
 
 case $machine in
-	i[34567]86-*-linux-gnu*)
+	i[34567]86-*-linux*)
 		:
 		;;
 
@@ -35,7 +35,7 @@ case $machine in
 		;;
 
 	*-*-netbsd* | \
-	alpha*-*-linux-gnulibc1* | \
+	alpha*-*-linux*libc1* | \
 	i?86-*-openbsd* | \
 	i?86-*-solaris2* | \
 	sparcv9-*-solaris2* | \
@@ -63,7 +63,7 @@ case $machine in
 	hppa1.1-*-bsd* | \
 	hppa1.0-*-bsd* | \
 	hppa*-*-lites* | \
-	*-*-linux-gnu* | \
+	*-*-linux* | \
 	*-*-gnu* | \
 	i?86-moss-msdos* | i?86-*-moss* | \
 	i?86-*-osf1* | \
diff --git a/gcc/install.texi b/gcc/install.texi
index f5968b1..d3614d0 100644
--- a/gcc/install.texi
+++ b/gcc/install.texi
@@ -776,8 +776,8 @@ Here is a list of system types:
 
 @quotation
 386bsd, aix, acis, amigaos, aos, aout, aux, bosx, bsd, clix, coff, ctix, cxux,
-dgux, dynix, ebmon, ecoff, elf, esix, freebsd, hms, genix, gnu, linux-gnu,
-hiux, hpux, iris, irix, isc, luna, lynxos, mach, minix, msdos, mvs,
+dgux, dynix, ebmon, ecoff, elf, esix, freebsd, hms, genix, gnu, linux,
+linux-gnu, hiux, hpux, iris, irix, isc, luna, lynxos, mach, minix, msdos, mvs,
 netbsd, newsos, nindy, ns, osf, osfrose, ptx, riscix, riscos, rtu, sco, sim,
 solaris, sunos, sym, sysv, udi, ultrix, unicos, uniplus, unos, vms, vsta,
 vxworks, winnt, xenix.
@@ -793,6 +793,12 @@ make a difference.  For example, you can write @samp{bsd4.3} or
 number is most needed for @samp{sysv3} and @samp{sysv4}, which are often
 treated differently.
 
+@samp{linux} and @samp{linux-gnu} are equivalent.  The distinction is
+purely political, and has no effect on the compiler.  The version of
+the kernel in use is not relevant on these systems.  A suffix such as
+@samp{libc1} or @samp{aout} distinguishes major versions of the C library;
+all of the suffixed versions are obsolete.
+
 If you specify an impossible combination such as @samp{i860-dg-vms},
 then you may get an error message from @file{configure}, or it may
 ignore part of the information and do the best it can with the rest.
@@ -940,12 +946,13 @@ configuration.
 @item arm-*-elf
 This configuration is intended for embedded systems.
 
-@item arm-*-linux-gnuaout
+@item arm-*-linux*aout
 Any of the ARM-family processors running the Linux-based GNU system with
 the @file{a.out} binary format.  This is an obsolete configuration.
 
-@item arm-*-linux-gnu
-@itemx arm-*-linux-gnuoldld
+@item arm-*-linux
+@itemx arm-*-linux-gnu
+@itemx arm-*-linux*oldld
 Any of the ARM-family processors running the Linux-based GNU system with
 the @file{ELF} binary format.  You must use version 2.9.1.0.22 or later
 of the GNU/Linux binutils, which you can download from
@@ -1087,17 +1094,18 @@ option before building.
 This port is very preliminary and has many known bugs.  We hope to
 have a higher-quality port for this machine soon.
 
-@item i386-*-linux-gnuoldld
+@item i386-*-linux*oldld
 Use this configuration to generate @file{a.out} binaries on Linux-based
 GNU systems if you do not have gas/binutils version 2.5.2 or later
 installed. This is an obsolete configuration.
 
-@item i386-*-linux-gnuaout
+@item i386-*-linux*aout
 Use this configuration to generate @file{a.out} binaries on Linux-based
 GNU systems. This configuration is being superseded. You must use
 gas/binutils version 2.5.2 or later.
 
-@item i386-*-linux-gnu
+@item i386-*-linux
+@itemx i386-*-linux-gnu
 Use this configuration to generate ELF binaries on Linux-based GNU
 systems.  You must use gas/binutils version 2.5.2 or later.
 
@@ -1559,7 +1567,8 @@ PowerPC system in big endian mode, running System V.4.
 You can specify a default version for the @samp{-mcpu=}@var{cpu_type}
 switch by using the configure option @samp{--with-cpu-}@var{cpu_type}.
 
-@item powerpc-*-linux-gnu
+@item powerpc-*-linux
+@itemx powerpc-*-linux-gnu
 PowerPC system in big endian mode, running the Linux-based GNU system.
 
 You can specify a default version for the @samp{-mcpu=}@var{cpu_type}