x

From-SVN: r14418

diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 9fbd818b778b9eb081459653f6dcd66f024fa5ce..a3113bf9c05d2c385f31c9606afa8b7b264bbdba 100644 (file)
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -2115,8 +2115,7 @@ literal_section ()                                                \
 #define MIPS_DEBUGGING_INFO            /* MIPS specific debugging info */
 
 #ifndef PREFERRED_DEBUGGING_TYPE       /* assume SDB_DEBUGGING_INFO */
-#define PREFERRED_DEBUGGING_TYPE  \
- ((len > 1 && !strncmp (str, "ggdb", len)) ? DBX_DEBUG : SDB_DEBUG)
+#define PREFERRED_DEBUGGING_TYPE  SDB_DEBUG
 #endif
 
 

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 74068d4497b4f420cbcc16c6da52226e6b8a6b91..58ed718cad72a42b1823fca408452d7ca88cecb1 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -904,7 +904,7 @@ while (0)
 #define MIPS_DEBUGGING_INFO            /* MIPS specific debugging info */
 
 #ifndef PREFERRED_DEBUGGING_TYPE       /* assume SDB_DEBUGGING_INFO */
-#define PREFERRED_DEBUGGING_TYPE ((!strncmp (str, "ggdb", 4)) ? DBX_DEBUG : SDB_DEBUG)
+#define PREFERRED_DEBUGGING_TYPE SDB_DEBUG
 #endif
 
 /* By default, turn on GDB extensions.  */

diff --git a/gcc/config/ns32k/tek6000.h b/gcc/config/ns32k/tek6000.h
index 00ddc96498bb4489d9ea03aae29bb22164219730..5b84bcb76400b676ceea10752b48328ea8b48e9f 100644 (file)
--- a/gcc/config/ns32k/tek6000.h
+++ b/gcc/config/ns32k/tek6000.h
@@ -72,8 +72,10 @@ Boston, MA 02111-1307, USA.  */
 /* Act the same as the UTek complier: -g for dbx, -go for sdb.
  * This is used in toplev.c.
  */
-#define PREFERRED_DEBUGGING_TYPE \
-       ((len > 1 && !strncmp(str, "go", len)) ? SDB_DEBUG : DBX_DEBUG )
+#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+#define CC1_SPEC "{go:-gcoff}"
+#define CC1PLUS_SPEC "{go:-gcoff}"
 
 /* Sequent has some changes in the format of DBX symbols.  */
 #define DBX_NO_XREFS 1

diff --git a/gcc/toplev.c b/gcc/toplev.c
index eb6f14bf9d1539cd6cc0dfdc4c3902104e859559..9ca2f756cc2891c705c84f959e79d663259afafe 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -4014,10 +4014,18 @@ main (argc, argv, envp)
                          level = 0;
                        }
 
-                     /* ??? A few targets use STR in the
-                        definition of PREFERRED_DEBUGGING_TYPE!  */
                      if (type == NO_DEBUG)
-                       type = PREFERRED_DEBUGGING_TYPE;
+                       {
+                         type = PREFERRED_DEBUGGING_TYPE;
+                         if (len > 1 && strncmp (str, "ggdb", len) == 0)
+                           {
+#ifdef DWARF2_DEBUGGING_INFO
+                             type = DWARF2_DEBUG;
+#elif defined DBX_DEBUGGING_INFO
+                             type = DBX_DEBUG;
+#endif
+                           }
+                       }
 
                      if (type == NO_DEBUG)
                        warning ("`-%s' not supported by this configuration of GCC",