--- gcc/configure	2018/04/24 18:25:09	1.1.1.8
+++ gcc/configure	2018/04/24 18:37:23	1.1.1.9
@@ -844,7 +844,7 @@ for machine in $canon_build $canon_host
 		xm_file=i370/xm-mvs.h
 		out_file=i370/mvs370.c
 		;;
-	i[345]86-ibm-aix*)		# IBM PS/2 running AIX
+	i[3456]86-ibm-aix*)		# IBM PS/2 running AIX
 		cpu_type=i386
                 if [ x$gas = xyes ]
 		then
@@ -867,7 +867,7 @@ for machine in $canon_build $canon_host
 		extra_parts="crtbegin.o crtend.o"
 		tmake_file=i386/t-crtpic
 		;;
-	i[345]86-next-*)
+	i[3456]86-next-*)
 		cpu_type=i386
 		tm_file=i386/next.h
 		out_file=i386/next.c
@@ -875,7 +875,7 @@ for machine in $canon_build $canon_host
 		tmake_file=i386/t-next
 		xmake_file=i386/x-next
 		;;
-	i[345]86-sequent-bsd*) 		# 80386 from Sequent
+	i[3456]86-sequent-bsd*) 		# 80386 from Sequent
 		cpu_type=i386
 		use_collect2=yes
 		if [ x$gas = xyes ]
@@ -885,7 +885,7 @@ for machine in $canon_build $canon_host
 			tm_file=i386/sequent.h
 		fi
 		;;
-	i[345]86-sequent-ptx1*)
+	i[3456]86-sequent-ptx1*)
 		cpu_type=i386
 		xm_file=i386/xm-sysv3.h
 		xmake_file=i386/x-sysv3
@@ -896,7 +896,7 @@ for machine in $canon_build $canon_host
 		install_headers_dir=install-headers-cpio
 		broken_install=yes
 		;;
-	i[345]86-sequent-ptx2* | i[345]86-sequent-sysv*)
+	i[3456]86-sequent-ptx2* | i[3456]86-sequent-sysv*)
 		cpu_type=i386
 		xm_file=i386/xm-sysv3.h
 		xmake_file=i386/x-sysv3
@@ -912,18 +912,18 @@ for machine in $canon_build $canon_host
 		tm_file=i386/sun.h
 		use_collect2=yes
 		;;
-	i[345]86-*-aout*)
+	i[3456]86-*-aout*)
 		cpu_type=i386
 		tm_file=i386/i386-aout.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[345]86-*-bsdi* | i[345]86-*-bsd386*)
+	i[3456]86-*-bsdi* | i[3456]86-*-bsd386*)
 		cpu_type=i386
 		tm_file=i386/bsd386.h
 		xm_file=i386/xm-bsd386.h
 #		tmake_file=t-libc-ok
 		;;
-	i[345]86-*-bsd*)
+	i[3456]86-*-bsd*)
 		cpu_type=i386
 		tm_file=i386/386bsd.h
 		xm_file=i386/xm-bsd386.h
@@ -931,7 +931,7 @@ for machine in $canon_build $canon_host
 # Next line turned off because both 386BSD and BSD/386 use GNU ld.
 #		use_collect2=yes
 		;;
-	i[345]86-*-freebsd*)
+	i[3456]86-*-freebsd*)
 		cpu_type=i386
 		tm_file=i386/freebsd.h
 		xm_file=i386/xm-freebsd.h
@@ -939,7 +939,7 @@ for machine in $canon_build $canon_host
 		fixincludes=Makefile.in
 		xmake_file=i386/x-freebsd
 		;;
-	i[345]86-*-netbsd*)
+	i[3456]86-*-netbsd*)
 		cpu_type=i386
 		tm_file=i386/netbsd.h
 		xm_file=i386/xm-netbsd.h
@@ -948,19 +948,19 @@ for machine in $canon_build $canon_host
 		tmake_file=t-libc-ok
 		xmake_file=x-netbsd
 		;;
-	i[345]86-*-coff*)
+	i[3456]86-*-coff*)
 		cpu_type=i386
 		tm_file=i386/i386-coff.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[345]86-*-gnu*)
+	i[3456]86-*-gnu*)
 		cpu_type=i386	# GNU supports this CPU; rest done below.
 		;;
-	i[345]86-*-isc*)		# 80386 running ISC system
+	i[3456]86-*-isc*)		# 80386 running ISC system
 		cpu_type=i386
 		xm_file=i386/xm-isc.h
 		case $machine in
-		  i[345]86-*-isc[34]*)
+		  i[3456]86-*-isc[34]*)
 		    xmake_file=i386/x-isc3
 		    ;;
 		  *)
@@ -981,41 +981,53 @@ for machine in $canon_build $canon_host
 		install_headers_dir=install-headers-cpio
 		broken_install=yes
 		;;
-	i[345]86-*-linux*oldld*)	# Intel 80386's running Linux
+	i[3456]86-*-linux*oldld*)	# Intel 80386's running GNU/Linux
 		cpu_type=i386		# with a.out format using pre BFD linkers
 		xm_file=i386/xm-linux.h
 		xmake_file=x-linux
 		tm_file=i386/linux-oldld.h
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
+		fixincludes=Makefile.in # The headers are ok already.
 		broken_install=yes
 		gnu_ld=yes
 		;;
-	i[345]86-*-linux*aout*)		# Intel 80386's running Linux
+	i[3456]86-*-linux*aout*)		# Intel 80386's running GNU/Linux
 		cpu_type=i386		# with a.out format
 		xm_file=i386/xm-linux.h
 		xmake_file=x-linux
 		tm_file=i386/linux-aout.h
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
+		fixincludes=Makefile.in # The headers are ok already.
 		broken_install=yes
 		gnu_ld=yes
 		;;
-	i[345]86-*-linux*)		# Intel 80386's running Linux
-		cpu_type=i386		# with ELF format
+	i[3456]86-*-linuxlibc1*)		# Intel 80386's running GNU/Linux
+		cpu_type=i386		# with ELF format, using GNU libc v1.
 		xm_file=i386/xm-linux.h
 		xmake_file=x-linux
+		tmake_file=t-linux-libc1
 		tm_file=i386/linux.h
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
+		fixincludes=Makefile.in # The headers are ok already.
 		broken_install=yes
 		gnu_ld=yes
-		# Don't use it. Linux uses a slightly different one.
-		# The real one comes with the Linux C library.
+		# GNU libc v1 supplies these.
 		#extra_parts="crtbegin.o crtend.o"
 		;;
-      i[345]86-go32-msdos | i[345]86-*-go32)
+	i[3456]86-*-linux*)		# Intel 80386's running GNU/Linux
+		cpu_type=i386		# with ELF format
+		xm_file=i386/xm-linux.h
+		xmake_file=x-linux
+		tm_file=i386/linux.h
+		fixincludes=Makefile.in # The headers are ok already.
+		broken_install=yes
+		gnu_ld=yes
+		# GNU libc version 2 does not supply these;
+		# we want them from GCC.
+		extra_parts="crtbegin.o crtend.o"
+		;;
+        i[3456]86-go32-msdos | i[3456]86-*-go32)
               cpu_type=i386
               tm_file=i386/go32.h
               ;;
-	i[345]86-*-lynxos*)
+	i[3456]86-*-lynxos*)
 		cpu_type=i386
 		if [ x$gas = xyes ]
 		then
@@ -1027,13 +1039,13 @@ for machine in $canon_build $canon_host
 		tmake_file=i386/t-i386bare
 		xmake_file=x-lynx
 		;;
-	i[345]86-*-mach*)
+	i[3456]86-*-mach*)
 		cpu_type=i386
 		tm_file=i386/mach.h
 #		tmake_file=t-libc-ok
 		use_collect2=yes
 		;;
-	i[345]86-*-osfrose*)		# 386 using OSF/rose
+	i[3456]86-*-osfrose*)		# 386 using OSF/rose
 		cpu_type=i386
                 if [ x$elf = xyes ]
 		then
@@ -1047,7 +1059,7 @@ for machine in $canon_build $canon_host
 		xmake_file=i386/x-osfrose
 		extra_objs=halfpic.o
 		;;
-	i[345]86-*-sco3.2v4*)	 	# 80386 running SCO 3.2v4 system
+	i[3456]86-*-sco3.2v4*)	 	# 80386 running SCO 3.2v4 system
 		cpu_type=i386
 		xm_file=i386/xm-sco.h
 		xmake_file=i386/x-sco4
@@ -1065,7 +1077,7 @@ for machine in $canon_build $canon_host
 			extra_parts="crtbegin.o crtend.o"
 		fi
 		;;
-	i[345]86-*-sco*)	 	# 80386 running SCO system
+	i[3456]86-*-sco*)	 	# 80386 running SCO system
 		cpu_type=i386
 		xm_file=i386/xm-sco.h
 		xmake_file=i386/x-sco
@@ -1083,7 +1095,7 @@ for machine in $canon_build $canon_host
 		fi
 		truncate_target=yes
 		;;
-	i[345]86-*-solaris2* | i[345]86-*-sunos5*)
+	i[3456]86-*-solaris2* | i[3456]86-*-sunos5*)
 		cpu_type=i386
 		xm_file=i386/xm-sysv4.h
 		tm_file=i386/sol2.h
@@ -1093,7 +1105,7 @@ for machine in $canon_build $canon_host
 		fixincludes=fixinc.svr4
 		broken_install=yes
 		;;
-	i[345]86-*-sysv4*)		# Intel 80386's running system V.4
+	i[3456]86-*-sysv4*)		# Intel 80386's running system V.4
 		cpu_type=i386
 		xm_file=i386/xm-sysv4.h
 		if [ x$stabs = xyes ]
@@ -1106,7 +1118,7 @@ for machine in $canon_build $canon_host
 		xmake_file=x-svr4
 		extra_parts="crtbegin.o crtend.o"
 		;;
-	i[345]86-*-sysv*)		# Intel 80386's running system V
+	i[3456]86-*-sysv*)		# Intel 80386's running system V
 		cpu_type=i386
 		xm_file=i386/xm-sysv3.h
 		xmake_file=i386/x-sysv3
@@ -1134,7 +1146,7 @@ for machine in $canon_build $canon_host
 		tmake_file=i386/t-vsta
 		xmake_file=i386/x-vsta
 		;;
-	i[345]86-*-winnt3*)
+	i[3456]86-*-winnt3*)
 		cpu_type=i386
 		tm_file=i386/win-nt.h
 		out_file=i386/i386.c
@@ -1523,26 +1535,24 @@ for machine in $canon_build $canon_host
 		extra_parts="crtbegin.o crtend.o"
 		extra_headers=math-68881.h
 		;;
-	m68k-*-linux*aout*)		# Motorola m68k's running Linux
+	m68k-*-linux*aout*)		# Motorola m68k's running GNU/Linux
 		xm_file=m68k/xm-linux.h	# with a.out format
 		xmake_file=x-linux
 		tm_file=m68k/linux-aout.h
 		tmake_file=m68k/t-linux
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
+		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		gnu_ld=yes
 		;;
-	m68k-*-linux*)			# Motorola m68k's running Linux
+	m68k-*-linux*)			# Motorola m68k's running GNU/Linux
 		xm_file=m68k/xm-linux.h	# with ELF format
 		xmake_file=x-linux
 		tm_file=m68k/linux.h
 		tmake_file=m68k/t-linux
-		fixincludes=Makefile.in #On Linux, the headers are ok already.
+		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		gnu_ld=yes
-		# Don't use it. Linux uses a slightly different one.
-		# The real one comes with the Linux C library.
-		#extra_parts="crtbegin.o crtend.o"
+		extra_parts="crtbegin.o crtend.o"
 		;;
 	m88k-dg-dgux*)
 		case $machine in
@@ -2535,7 +2545,7 @@ do
 	case $lang in
 	..) ;;
 	# The odd quoting in the next line works around
-	# an apparent bug in bash 1.12 on linux.
+	# an apparent bug in bash 1.12 on GNU/Linux.
 	${srcdir}/[*]/config-lang.in) ;;
 	*) subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;;
 	esac
@@ -2543,7 +2553,7 @@ done
 
 # Are we using gcc as the native compiler?
 case $canon_host in
-*linux*)	# All Linux's use gcc as the native compiler.
+*linux*)	# All GNU/Linux systems use gcc as the native compiler.
 	prefix=$native_prefix
 	;;
 esac