From 8ddf07a29ae8343cb19f9d65f7d016680bb0e786 Mon Sep 17 00:00:00 2001
From: Mark Alexander <marka@cygnus>
Date: Thu, 24 Oct 1996 18:51:46 +0000
Subject: [PATCH] 	* dbxread.c (process_one_symbol): Interpret
 end-of-function 	markers correctly; this fixes problem on Vr5000 where
 all 	functions in a module had the same address. 	* configure.in,
 configure.tgt, configure.host, gdbserver/configure.in: 	Correct	for
 pc-linux-gnu problem in config.guess. 	* configure: Regenerate.

---
 gdb/configure      | 2 +-
 gdb/configure.host | 3 ++-
 gdb/configure.in   | 2 +-
 gdb/configure.tgt  | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdb/configure b/gdb/configure
index ca507a3fa6b..7bc071cb407 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2663,7 +2663,7 @@ if test "${shared}" = "true"; then
     ;;
   *-*-linux*aout*)
     ;;
-  *-*-linux*)
+  *-*-linux* | *-pc-linux-gnu)
     HLDFLAGS='-Wl,-rpath,$(libdir)'
     ;;
   *-*-solaris*)
diff --git a/gdb/configure.host b/gdb/configure.host
index 99a9b011439..db8e3b21dae 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -12,7 +12,7 @@ case "${host_cpu}" in
 
 c[12])			gdb_host_cpu=convex ;;
 hppa*)			gdb_host_cpu=pa ;;
-i[3456]86)		gdb_host_cpu=i386 ;;
+i[3456]86*)		gdb_host_cpu=i386 ;;
 m68*)			gdb_host_cpu=m68k ;;
 m88*)			gdb_host_cpu=m88k ;;
 np1)			gdb_host_cpu=gould ;;
@@ -59,6 +59,7 @@ i[3456]86-*-mach3*)	gdb_host=i386m3 ;;
 i[3456]86-*-mach*)	gdb_host=i386mach ;;
 i[3456]86-*-gnu*)	gdb_host=i386gnu ;;
 i[3456]86-*-osf1mk*)	gdb_host=osf1mk ;;
+i[3456]86-*-pc-linux-gnu) gdb_host=linux ;;
 i[3456]86-*-sco3.2v5*)	gdb_host=i386sco5 ;;
 i[3456]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
 i[3456]86-*-sco*)	gdb_host=i386sco ;;
diff --git a/gdb/configure.in b/gdb/configure.in
index 10b9df70284..ca6b9954d16 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -309,7 +309,7 @@ if test "${shared}" = "true"; then
     ;;
   *-*-linux*aout*)
     ;;
-  *-*-linux*)
+  *-*-linux* | *-pc-linux-gnu)
     HLDFLAGS='-Wl,-rpath,$(libdir)'
     ;;
   *-*-solaris*)
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 2c5da14dec1..1d36ed89767 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -15,7 +15,7 @@ case "${target_cpu}" in
 alpha)			gdb_target_cpu=alpha ;;
 c[12])			gdb_target_cpu=convex ;;
 hppa*)			gdb_target_cpu=pa ;;
-i[3456]86)		gdb_target_cpu=i386 ;;
+i[3456]86*)		gdb_target_cpu=i386 ;;
 m68*)			gdb_target_cpu=m68k ;;
 m88*)			gdb_target_cpu=m88k ;;
 mips*)			gdb_target_cpu=mips ;;
@@ -91,6 +91,8 @@ i[3456]86-*-sco*)	gdb_target=i386v ;;
 i[3456]86-*-sysv*)	gdb_target=i386v ;;
 i[3456]86-*-linux*)	gdb_target=linux
 		configdirs="${configdirs} gdbserver" ;;
+i[3456]86-pc-linux-gnu)	gdb_target=linux
+		configdirs="${configdirs} gdbserver" ;;
 i[3456]86-*-isc*)	gdb_target=i386v ;;
 i[3456]86-*-mach3*)	gdb_target=i386m3 ;;
 i[3456]86-*-mach*)	gdb_target=i386mach ;;
-- 
2.30.2