diff --git a/ChangeLog b/ChangeLog
index a75440e8d52..b2a174628ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* 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*.
+
 2000-08-13  Geoff Keating  <geoffk@cygnus.com>
 
 	* Makefile.in (GCC_FOR_TARGET): Also add -B$$r/gcc/ here.
diff --git a/configure b/configure
index 9de3cc4eb12..e0d60261c70 100755
--- a/configure
+++ b/configure
@@ -53,6 +53,8 @@ cache_file_option=
 configdirs=
 extraconfigdirs=
 diroptions=
+enable_threads=no
+enable_shared=no
 exec_prefix=
 exec_prefixoption=
 fatal=
@@ -86,7 +88,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.26 $"
+version="$Revision: 1.27 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -1335,12 +1337,8 @@ EOF
                 echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
             fi 
 
-	    # record if we want to build shared libs.
-	    if test -z "${enable_shared}"; then
-	        echo enable_shared = no >> ${Makefile}
-	    else
-	        echo enable_shared = ${enable_shared} >> ${Makefile}
-	    fi
+	    echo enable_shared = ${enable_shared} >> ${Makefile}
+	    echo enable_threads = ${enable_threads} >> ${Makefile}
 	    # record if we want to rumtime library stuff installed in libsubdir.
 	    if test -z "${enable_version_specific_runtime_libs}"; then
 	        echo enable_version_specific_runtime_libs = no >> ${Makefile}
diff --git a/configure.in b/configure.in
index 9ecd267b2d2..4ad311d83ed 100644
--- a/configure.in
+++ b/configure.in
@@ -352,7 +352,7 @@ case "${target}" in
   powerpc-*-netware*)
     target_makefile_frag="${target_makefile_frag} config/mt-netware"
     ;;
-  *-*-linux-gnu*)
+  *-*-linux*)
     target_makefile_frag="${target_makefile_frag} config/mt-linux"
     ;;
   *-*-aix4.[3456789]* | *-*-aix[56789].*)
@@ -684,7 +684,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libg++ ${libstdcxx_version} target-librx target-libgloss target-libffi"
     ;;
   hppa*-*-*elf* | \
-  hppa*-*-linux-gnu* | \
+  hppa*-*-linux* | \
   hppa*-*-lites* | \
   hppa*64*-*-*)
     # Do configure ld/binutils/gas for this case.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0cab5b93a6..16bd605e533 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 cc64ac56ee5..fe38ab5b4b8 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 82653038da6..ed68e898c64 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 8ad11e25fc9..14c697f6f83 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 44a984230cc..b1172d72779 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 c01d80805cb..058c16354fc 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 f5968b1f26b..d3614d03e7b 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}
diff --git a/libio/ChangeLog b/libio/ChangeLog
index edac14e01c1..8376dd7e62b 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
+	Honor --disable-threads.
+
 Sun Jul 23 15:16:23 2000  Krister Walfridsson  <cato@df.lth.se>
 
 	* gen-params: Added trailing space for 'long long int' regexp.
diff --git a/libio/configure.in b/libio/configure.in
index 7f4f0c67463..2a14a926d39 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -47,22 +47,27 @@ package_makefile_rules_frag=Make.pack.r
 
 echo "# Warning: this fragment is automatically generated" > temp.mt
 frags=
+case x$enable_threads in
+	xno) ;;
+	*)   mtsafe=mtsafe.mt ;;
+esac
 
 case "${target}" in
   *-mpeix*)      frags="mpeix.mt" ;;
   *-hpux*)       frags=hpux.mt ;;
-  alpha*-*-linux-gnulibc1)
-		 frags="linux.mt linuxaxp1.mt mtsafe.mt" ;;
-  powerpc*-*-linux-gnulibc1)
-		 frags="linux.mt linuxaxp1.mt mtsafe.mt" ;;
-  *-linux-gnulibc1)
+  alpha*-*-linux*libc1)
+		 frags="linux.mt linuxaxp1.mt $mtsafe" ;;
+  powerpc*-*-linux*libc1)
+		 frags="linux.mt linuxaxp1.mt $mtsafe" ;;
+  *-linux*libc1)
 		 frags=linuxlibc1.mt ;;
-  *-linux-gnu*)  frags="linux.mt mtsafe.mt" ;;
+  *-linux*)
+		 frags="linux.mt $mtsafe" ;;
   *-isc*)        frags=isc.mt ;;
   *-netware*)    frags=netware.mt ;;
   *-dgux*)	 frags=dgux.mt ;;
   *vxworks*)     frags="vxworks.mt" ;;
-  *-beos*)	 frags="beos.mt mtsafe.mt" ;;
+  *-beos*)	 frags="beos.mt $mtsafe" ;;
   *)             frags=${target_cpu}.mt ;;
 esac
 
@@ -88,7 +93,7 @@ fi
 
 # Take care of header file lossage.
 case "${target}" in
-  alpha*-*-linux-gnulibc1)
+  alpha*-*-linux*libc1)
     # For some reason stdio-lock.h is not installed on Red Hat systems.
     # Further, libc-lock.h needs to define the pthreads stuff weak, and
     # fails to do this for other than _LIBC.  Install our own versions
@@ -96,7 +101,7 @@ case "${target}" in
     cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h
     cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h
     ;;
-  powerpc*-*-linux-gnulibc1)
+  powerpc*-*-linux*libc1)
     # For some reason stdio-lock.h is not installed on Red Hat systems.
     # Further, libc-lock.h needs to define the pthreads stuff weak, and
     # fails to do this for other than _LIBC.  Install our own versions
@@ -104,7 +109,7 @@ case "${target}" in
     cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h
     cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h
     ;;
-  *-linux-gnu*)
+  *-linux*)
     # We have a correct libc-lock.h in glibc 2.1 but not all glibc 2.0.
     # Create a wrapper if necessary.
     (echo "#include <bits/libc-lock.h>" | ${CC-cc} -E -) >/dev/null 2>&1 ||
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 0daee93d12f..541193dd7cb 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure: Regenerate after change to ../libtool.m4.
+
 2000-08-14  Andreas Schwab  <schwab@suse.de>
 
 	* objc-features.texi (Top): Move @menu at end of node.
diff --git a/libobjc/configure b/libobjc/configure
index 132e043ad0a..aa6b8226154 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -1603,7 +1603,7 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case "$host_cpu" in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 620a3c59b89..dd77a58534b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure: Regenerate after change to ../libtool.m4.
+
 2000-08-10  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
 	* bits/locale_facets.tcc: Formatting tweaks.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index d1b4b7f6f42..90dbacc9463 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -1863,7 +1863,7 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case "$host_cpu" in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
@@ -18136,12 +18136,15 @@ else
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -18196,7 +18199,7 @@ main()
 	/*
 	 * First, make a file with some known garbage in it.
 	 */
-	data = malloc(pagesize);
+	data = (char*)malloc(pagesize);
 	if (!data)
 		exit(1);
 	for (i = 0; i < pagesize; ++i)
@@ -18217,7 +18220,7 @@ main()
 	fd = open("conftestmmap", O_RDWR);
 	if (fd < 0)
 		exit(1);
-	data2 = malloc(2 * pagesize);
+	data2 = (char*)malloc(2 * pagesize);
 	if (!data2)
 		exit(1);
 	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
@@ -18235,7 +18238,7 @@ main()
 	 */
 	for (i = 0; i < pagesize; ++i)
 		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
+	data3 = (char*)malloc(pagesize);
 	if (!data3)
 		exit(1);
 	if (read(fd, data3, pagesize) != pagesize)
@@ -18249,7 +18252,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:18253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -18312,19 +18315,19 @@ fi
 
 if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:18316: checking for LC_MESSAGES" >&5
+echo "configure:18319: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18321 "configure"
+#line 18324 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:18328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_val_LC_MESSAGES=yes
 else
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index ba4a27385e5..b6d1b7ea5f8 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
+	Honor --disable-threads.
+
 2000-08-11  Jason Merrill  <jason@redhat.com>
 
 	* std/straits.h (is_del): Boolify with !!.
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index a88fe0a68a0..993849f4957 100644
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -89,10 +89,11 @@ fi
 
 # Make sure the right flags are defined for multi-threading.
 case "${target}" in
-  alpha*-*-linux-gnulibc1)	frags="${frags} linux.mt" ;;
-  powerpc*-*-linux-gnulibc1)	frags="${frags} linux.mt" ;;
-  *-*-linux-gnu*)		frags="${frags} linux.mt" ;;
-  *-*-openbsd*)		
+  *-*-linux*)
+	case "x${enable_threads}" in
+		xyes|xposix)	frags="${frags} linux.mt" ;;
+	esac;;
+  *-*-openbsd*)	
   	case "x${enable_threads}" in
 		xyes|xposix)	frags="${frags} openbsd.mt" ;;
 	esac;;
diff --git a/libtool.m4 b/libtool.m4
index 05c56ccbaf6..27718eb76af 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -579,7 +579,7 @@ irix5* | irix6*)
   ;;
 
 # This must be Linux ELF.
-linux-gnu*)
+linux*)
   case "$host_cpu" in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;