Humoring RMS by saying "GNU/Linux" instead of just "Linux"

9 files changed, 16 insertions, 14 deletions

diff --git a/gdb/NEWS b/gdb/NEWS
index f597efd..1af82f9 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -5,12 +5,12 @@
 
 * New native configurations
 
-Alpha Linux					alpha*-*-linux*
+Alpha GNU/Linux					alpha*-*-linux*
 Unixware 2.x					i[3456]86-unixware2*
 Irix 6.x					mips*-sgi-irix6*
-PowerPC Linux					powerpc-*-linux*
+PowerPC GNU/Linux				powerpc-*-linux*
 PowerPC Solaris					powerpcle-*-solaris*
-Sparc Linux					sparc-*-linux*
+Sparc GNU/Linux					sparc-*-linux*
 Motorola sysV68 R3V7.1				m68k-motorola-sysv
 
 * New targets
diff --git a/gdb/acconfig.h b/gdb/acconfig.h
index 20908e8..b4dbe09 100644
--- a/gdb/acconfig.h
+++ b/gdb/acconfig.h
@@ -30,7 +30,7 @@
 /* Define if using Solaris thread debugging.  */
 #undef HAVE_THREAD_DB_LIB
 
-/* Define on a Linux system to work around problems in sys/procfs.h.  */
+/* Define on a GNU/Linux system to work around problems in sys/procfs.h.  */
 #undef START_INFERIOR_TRAPS_EXPECTED
 #undef sys_quotactl
 
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 69be204..fc11b44 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -134,7 +134,7 @@ struct linked_proc_info
 } *linked_proc_desc_table = NULL;
 
 
-/* Under Linux, signal handler invocations can be identified by the
+/* Under GNU/Linux, signal handler invocations can be identified by the
    designated code sequence that is used to return from a signal
    handler.  In particular, the return address of a signal handler
    points to the following sequence (the first instruction is quadword
diff --git a/gdb/config.in b/gdb/config.in
index ca16928..626f7fb 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -65,7 +65,7 @@
 /* Define if using Solaris thread debugging.  */
 #undef HAVE_THREAD_DB_LIB
 
-/* Define on a Linux system to work around problems in sys/procfs.h.  */
+/* Define on a GNU/Linux system to work around problems in sys/procfs.h.  */
 #undef START_INFERIOR_TRAPS_EXPECTED
 #undef sys_quotactl
 
diff --git a/gdb/config/i386/xm-linux.h b/gdb/config/i386/xm-linux.h
index f63d8fc..217c6d4 100644
--- a/gdb/config/i386/xm-linux.h
+++ b/gdb/config/i386/xm-linux.h
@@ -1,4 +1,4 @@
-/* Native support for linux, for GDB, the GNU debugger.
+/* Native support for GNU/Linux, for GDB, the GNU debugger.
    Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
 
 This file is part of GDB.
diff --git a/gdb/configure.in b/gdb/configure.in
index 44c47bf..16cda86 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -70,7 +70,7 @@ AC_C_CONST
 
 AC_CHECK_FUNCS(setpgid sbrk select poll sigaction)
 
-# If we are configured native on Linux, work around problems with sys/procfs.h
+# If we are configured native on GNU/Linux, work around problems with sys/procfs.h
 if test "${target}" = "${host}"; then
   case "${host}" in
   i[[3456]]86-*-linux*)
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index bb89166..489c20f 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -881,7 +881,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets)
 	  t = parse_type (cur_fd, ax, sh->index + 1, 0, bigend, name);
 	  if (STREQ(name, "malloc") && t->code == TYPE_CODE_VOID)
 	    {
-	      /* I don't know why, but, at least under Linux/Alpha,
+	      /* I don't know why, but, at least under Alpha GNU/Linux,
 		 when linking against a malloc without debugging
 		 symbols, its read as a function returning void---this
 		 is bad because it means we cannot call functions with
diff --git a/gdb/mon960-rom.c b/gdb/mon960-rom.c
index 0987802..b7684e7 100644
--- a/gdb/mon960-rom.c
+++ b/gdb/mon960-rom.c
@@ -140,7 +140,7 @@ static char *mon960_regnames[NUM_REGS];
 #if 0
 /* FIXME: this extremely long init string causes MON960 to return two NAKS
    instead of performing the autobaud recognition, at least when gdb
-   is running on Linux.  The short string below works on Linux, and on
+   is running on GNU/Linux.  The short string below works on Linux, and on
    SunOS using a tcp serial connection.  Must retest on SunOS using a
    direct serial connection; if that works, get rid of the long string. */
 static char *mon960_inits[] = {"\n\r\r\r\r\r\r\r\r\r\r\r\r\r\r\n\r\n\r\n", NULL};
diff --git a/gdb/solib.c b/gdb/solib.c
index 7d52b69..71faffd 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1544,7 +1544,7 @@ enable_break ()
 
 	 This address is stored on the stack.  However, I've been unable
 	 to find any magic formula to find it for Solaris (appears to
-	 be trivial on Linux).  Therefore, we have to try an alternate
+	 be trivial on GNU/Linux).  Therefore, we have to try an alternate
 	 mechanism to find the dynamic linker's base address.  */
       tmp_bfd = bfd_openr (buf, gnutarget);
       if (tmp_bfd == NULL)
@@ -1703,8 +1703,8 @@ solib_create_inferior_hook()
       return;
     }
 
-#ifndef SVR4_SHARED_LIBS
-  /* Only SunOS needs the loop below, other systems should be using the
+#if !defined(SVR4_SHARED_LIBS) || defined(_SCO_DS)
+  /* SCO and SunOS need the loop below, other systems should be using the
      special shared library breakpoints and the shared library breakpoint
      service routine.
 
@@ -1723,7 +1723,8 @@ solib_create_inferior_hook()
     }
   while (stop_signal != TARGET_SIGNAL_TRAP);
   stop_soon_quietly = 0;
-  
+
+#if !defined(_SCO_DS)
   /* We are now either at the "mapping complete" breakpoint (or somewhere
      else, a condition we aren't prepared to deal with anyway), so adjust
      the PC as necessary after a breakpoint, disable the breakpoint, and
@@ -1742,6 +1743,7 @@ solib_create_inferior_hook()
 
   if (auto_solib_add)
     solib_add ((char *) 0, 0, (struct target_ops *) 0);
+#endif /* ! _SCO_DS */
 #endif
 }