sol2.h (PREFERRED_DEBUGGING_TYPE): Use stabs.

* config/i386/sol2.h (PREFERRED_DEBUGGING_TYPE): Use stabs.
(ASM_SPEC): Moved from sol2dbg.h.  Added work-around for gas.
* config/i386/sol2dbg.h: Removed.
* config/i386/sol2gas.h: New file, to enable gas work-around.
* configure.in: Use i386/sol2gas.h on Solaris/x86 --with-gas.
Don't use sol2dbg.h.
* configure: Rebuilt.

From-SVN: r29585

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a56c48204b79d47ee58778f8f92a2871bdb9eed..510230037994a25e2e7df7adb30d193da8d6da47 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Wed Sep 22 07:07:44 1999  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+       * config/i386/sol2.h (PREFERRED_DEBUGGING_TYPE): Use stabs.
+       (ASM_SPEC): Moved from sol2dbg.h.  Added work-around for gas.
+       * config/i386/sol2dbg.h: Removed.
+       * config/i386/sol2gas.h: New file, to enable gas work-around.
+       * configure.in: Use i386/sol2gas.h on Solaris/x86 --with-gas.
+       Don't use sol2dbg.h.
+       * configure: Rebuilt.
+
 Wed Sep 15 21:20:38 1999  Mark Mitchell  <mark@codesourcery.com>
 
        * c-typeck.c (qualify_type): Merge qualifiers from both types.

diff --git a/gcc/config/i386/sol2.h b/gcc/config/i386/sol2.h
index cc5a089229f6318a9104b13126653a212db0b5d9..b254a10f2ea5cedb049297ac368c9d9b30836b3c 100644 (file)
--- a/gcc/config/i386/sol2.h
+++ b/gcc/config/i386/sol2.h
@@ -21,6 +21,33 @@ Boston, MA 02111-1307, USA.  */
 
 #include "i386/sysv4.h"
 
+/* We use stabs-in-elf for debugging, because that is what the native
+   toolchain uses.  */
+#undef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+#if ! GAS_REJECTS_MINUS_S
+
+/*
+  Changed from config/svr4.h in the following ways:
+
+  - Removed -Yd (neither the sun bundled assembler nor gas accept it).
+  - Added "-s" so that stabs are not discarded.
+*/
+
+#undef ASM_SPEC
+#define ASM_SPEC \
+  "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s"
+
+#else /* GAS_REJECTS_MINUS_S */
+
+/* Same as above, except for -s, unsupported by GNU as.  */
+#undef ASM_SPEC
+#define ASM_SPEC \
+  "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*}"
+
+#endif /* GAS_REJECTS_MINUS_S */
+
 /* The Solaris 2.0 x86 linker botches alignment of code sections.
    It tries to align to a 16 byte boundary by padding with 0x00000090
    ints, rather than 0x90 bytes (nop).  This generates trash in the

diff --git a/gcc/config/i386/sol2dbg.h b/gcc/config/i386/sol2dbg.h
deleted file mode 100644 (file)
index 9f95333..0000000
--- a/gcc/config/i386/sol2dbg.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Target definitions for GNU compiler for Intel 80386 running Solaris
-   with gas and gdb.
-   This file is added into the directory .../gcc-2.../config/i386
-   Workability without "#undef DWARF_DEBUGGING_INFO" is not tested. */
-
-/* Use stabs instead of DWARF debug format.  */
-#ifdef PREFERRED_DEBUGGING_TYPE
-#undef PREFERRED_DEBUGGING_TYPE
-#endif
-#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
-
-#include "i386/sol2.h"
-
-#ifdef DWARF_DEBUGGING_INFO
-#undef DWARF_DEBUGGING_INFO
-#endif
-
-/*
-  Changed from config/svr4.h in the following ways:
-
-  - Added "%{V}".
-  - Modified "{%v:-V}" to take into account "%{V}".
-  - Added "-s" so that stabs are saved in the final executable.  */
-
-#undef ASM_SPEC
-#define ASM_SPEC \
-  "%{V} %{v:%{!V:-V}} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} -s"

diff --git a/gcc/config/i386/sol2gas.h b/gcc/config/i386/sol2gas.h
index f8ca103f8e1c327c142f471ce20dd28bcd73d80c..7f2c9629d7c89c5e0ea0a05a5bcb921679d307e7 100644 (file)
--- a/gcc/config/i386/sol2gas.h
+++ b/gcc/config/i386/sol2gas.h
@@ -4,8 +4,8 @@
    Copyright (C) 1999 Free Software Foundation, Inc.
 */
 
-#ifndef GAS_REJECTS_MINUS_S
-#define GAS_REJECTS_MINUS_S 1
+#ifndef GAS_DOES_NOT_SUPPORT_MINUS_S
+#define GAS_DOES_NOT_SUPPORT_MINUS_S 1
 #endif
 
-/* Assume sol2.h will be included afterwards.  */
+#include "i386/sol2.h"

diff --git a/gcc/configure b/gcc/configure
index 5eeba77eea6cc28829d7f0dedc804b41285b576f..23de637b062ed5b60f2dcc51e9fc51decc0f151a 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -1310,7 +1310,7 @@ else
 fi
 
 # Find some useful tools
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -3750,9 +3750,9 @@ for machine in $build $host $target; do
        i[34567]86-*-solaris2*)
                xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
                xm_defines="USG POSIX SMALL_ARG_MAX"
-               if test x$stabs = xyes
-               then
-                       tm_file=i386/sol2dbg.h
+               if test x$gas = xyes; then
+                       # Only needed if gas does not support -s
+                       tm_file=i386/sol2gas.h
                else
                        tm_file=i386/sol2.h
                fi

diff --git a/gcc/configure.in b/gcc/configure.in
index 448e0f812796591645c24421ca317627c817bdd8..eec2795917306e6263c84420852200a06f1a105a 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1399,9 +1399,9 @@ changequote(,)dnl
 changequote([,])dnl
                xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
                xm_defines="USG POSIX SMALL_ARG_MAX"
-               if test x$stabs = xyes
-               then
-                       tm_file=i386/sol2dbg.h
+               if test x$gas = xyes; then
+                       # Only needed if gas does not support -s
+                       tm_file=i386/sol2gas.h
                else
                        tm_file=i386/sol2.h
                fi