From 7b00db47cefd914e1ba6682a986a10693aa1aa22 Mon Sep 17 00:00:00 2001
From: Yao Qi <yao@codesourcery.com>
Date: Mon, 2 Sep 2013 23:07:07 +0000
Subject: [PATCH] gdb/

	* config/djgpp/fnchange.lst: Remove entry of
	i386-interix-nat.c and i386-interix-tdep.c.
	* configure.ac: Remove '*-*-interix*'.
	* configure: Re-generated.
	* defs.h (enum gdb_osabi): Remove GDB_OSABI_INTERIX.
	* i386-cygwin-tdep.c (i386_cygwin_osabi_sniffer): Remove
	obsolete comments.
	* osabi.c (gdb_osabi_names): Remove "Interix".
---
 gdb/ChangeLog                 | 11 +++++++++++
 gdb/config/djgpp/fnchange.lst |  2 --
 gdb/configure                 |  2 +-
 gdb/configure.ac              |  2 +-
 gdb/defs.h                    |  1 -
 gdb/i386-cygwin-tdep.c        |  2 --
 gdb/osabi.c                   |  1 -
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7db880675a1..7a61d7a3f77 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-03  Yao Qi  <yao@codesourcery.com>
+
+	* config/djgpp/fnchange.lst: Remove entry of
+	i386-interix-nat.c and i386-interix-tdep.c.
+	* configure.ac: Remove '*-*-interix*'.
+	* configure: Re-generated.
+	* defs.h (enum gdb_osabi): Remove GDB_OSABI_INTERIX.
+	* i386-cygwin-tdep.c (i386_cygwin_osabi_sniffer): Remove
+	obsolete comments.
+	* osabi.c (gdb_osabi_names): Remove "Interix".
+
 2013-09-03  Yao Qi  <yao@codesourcery.com>
 
 	* arch-utils.c: Fix typo in the comment to gdbarch_update_p.
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index f23625105b6..197ae9794fc 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -282,8 +282,6 @@
 @V@/gdb/hppnbsd-tdep.c @V@/gdb/hppnb-tdep.c
 @V@/gdb/i386-darwin-nat.c @V@/gdb/i386dw-nat.c
 @V@/gdb/i386-darwin-tdep.c @V@/gdb/i386dw-tdep.c
-@V@/gdb/i386-interix-nat.c @V@/gdb/i386ix-nat.c
-@V@/gdb/i386-interix-tdep.c @V@/gdb/i386ix-tdep.c
 @V@/gdb/i386-linux-tdep.c @V@/gdb/i386lx-tdep.c
 @V@/gdb/i386-linux-nat.c @V@/gdb/i386lx-nat.c
 @V@/gdb/i386bsd-nat.c @V@/gdb/i3bsd-nat.c
diff --git a/gdb/configure b/gdb/configure
index a722b930831..b9c48a184b7 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10846,7 +10846,7 @@ fi
 
 if test "${target}" = "${host}"; then
   case "${host}" in
-  *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
+  *-*-sysv4.2* | *-*-sysv5* )
 
 $as_echo "#define NEW_PROC_API 1" >>confdefs.h
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 0982cac82a4..272c664c195 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1395,7 +1395,7 @@ fi
 
 if test "${target}" = "${host}"; then
   case "${host}" in
-  *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
+  *-*-sysv4.2* | *-*-sysv5* )
       AC_DEFINE(NEW_PROC_API, 1,
       [Define if you want to use new multi-fd /proc interface
        (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).])
diff --git a/gdb/defs.h b/gdb/defs.h
index 74b607d98a3..2ea49f8f449 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -587,7 +587,6 @@ enum gdb_osabi
   GDB_OSABI_WINCE,
   GDB_OSABI_GO32,
   GDB_OSABI_IRIX,
-  GDB_OSABI_INTERIX,
   GDB_OSABI_HPUX_ELF,
   GDB_OSABI_HPUX_SOM,
   GDB_OSABI_QNXNTO,
diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c
index dc5d614e5ec..a3e4e7c07fc 100644
--- a/gdb/i386-cygwin-tdep.c
+++ b/gdb/i386-cygwin-tdep.c
@@ -267,8 +267,6 @@ i386_cygwin_osabi_sniffer (bfd *abfd)
 {
   char *target_name = bfd_get_target (abfd);
 
-  /* Interix also uses pei-i386.
-     We need a way to distinguish between the two.  */
   if (strcmp (target_name, "pei-i386") == 0)
     return GDB_OSABI_CYGWIN;
 
diff --git a/gdb/osabi.c b/gdb/osabi.c
index a123ea05bce..249dac8b2e7 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -63,7 +63,6 @@ static const char * const gdb_osabi_names[] =
   "Windows CE",
   "DJGPP",
   "Irix",
-  "Interix",
   "HP/UX ELF",
   "HP/UX SOM",
   "QNX Neutrino",
-- 
2.30.2