--- gcc/configure	2018/04/24 18:37:23	1.1.1.9
+++ gcc/configure	2018/04/24 18:42:16	1.1.1.10
@@ -953,9 +953,6 @@ for machine in $canon_build $canon_host
 		tm_file=i386/i386-coff.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[3456]86-*-gnu*)
-		cpu_type=i386	# GNU supports this CPU; rest done below.
-		;;
 	i[3456]86-*-isc*)		# 80386 running ISC system
 		cpu_type=i386
 		xm_file=i386/xm-isc.h
@@ -999,29 +996,32 @@ for machine in $canon_build $canon_host
 		broken_install=yes
 		gnu_ld=yes
 		;;
-	i[3456]86-*-linuxlibc1*)		# Intel 80386's running GNU/Linux
+	i[3456]86-*-linux*gnulibc1)	# 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
+		tmake_file=t-linux-gnulibc1
 		tm_file=i386/linux.h
 		fixincludes=Makefile.in # The headers are ok already.
 		broken_install=yes
 		gnu_ld=yes
-		# GNU libc v1 supplies these.
-		#extra_parts="crtbegin.o crtend.o"
+		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		;;
 	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
+		tmake_file=t-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"
+		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+		;;
+	i[3456]86-*-gnu*)
+		cpu_type=i386	# GNU supports this CPU; rest done below.
 		;;
         i[3456]86-go32-msdos | i[3456]86-*-go32)
               cpu_type=i386
@@ -1544,6 +1544,16 @@ for machine in $canon_build $canon_host
 		extra_headers=math-68881.h
 		gnu_ld=yes
 		;;
+	m68k-*-linux*libc1)		# Motorola m68k's running GNU/Linux
+		xm_file=m68k/xm-linux.h	# with ELF format, using GNU libc v1.
+		xmake_file=x-linux
+		tm_file=m68k/linux.h
+		tmake_file=m68k/t-linux-gnulibc1
+		fixincludes=Makefile.in # The headers are ok already.
+		extra_headers=math-68881.h
+		gnu_ld=yes
+		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+		;;
 	m68k-*-linux*)			# Motorola m68k's running GNU/Linux
 		xm_file=m68k/xm-linux.h	# with ELF format
 		xmake_file=x-linux
@@ -1552,7 +1562,9 @@ for machine in $canon_build $canon_host
 		fixincludes=Makefile.in # The headers are ok already.
 		extra_headers=math-68881.h
 		gnu_ld=yes
-		extra_parts="crtbegin.o crtend.o"
+		# GNU libc version 2 does not supply these;
+		# we want them from GCC.
+		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		;;
 	m88k-dg-dgux*)
 		case $machine in
@@ -2389,6 +2401,8 @@ for machine in $canon_build $canon_host
 	esac
 
 	case $machine in
+	*-*-linux-gnu*)
+		;; # Existing Linux/GNU systems do not use the GNU setup.
 	*-*-gnu*)
 		# On the GNU system, the setup is just about the same on
 		# each different CPU.  The specific machines that GNU
@@ -2555,6 +2569,7 @@ done
 case $canon_host in
 *linux*)	# All GNU/Linux systems use gcc as the native compiler.
 	prefix=$native_prefix
+	gxx_include_dir=$prefix/include/g++
 	;;
 esac