2000-12-29 Robert Lipe <robertl@sco.com>

        Remove COFF support from i?86-pc-sco3.2v5.
        * i386/sco5.h (PREFERRED_DEBUGGING_TYPE): Change to Dwarf II.
        (TARGET_ELF): Now always true.
        (SUBTARGET_SWTICHES: )Remove -mcoff.

        * i386/t-sco5 (MULTILIB_OPTIONS, MULTILIB_DIRNAMES,
        MULTILIB_EXCEPTION): Nuke coff.
        (CRTSTUFF_T_CFLAGS_S):  Deleted.
        (TARGET_LIBGCC2_CFLAGS): Added.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38565 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h
index 54a0235..e9fae7a 100644 (file)
--- a/gcc/config/i386/sco5.h
+++ b/gcc/config/i386/sco5.h
@@ -556,7 +556,7 @@ do {                                                                        \
 #define SDB_DEBUGGING_INFO   1
 #define DBX_DEBUGGING_INFO   1
 #define PREFERRED_DEBUGGING_TYPE                                       \
-  ((TARGET_ELF) ? DWARF_DEBUG: SDB_DEBUG)
+  ((TARGET_ELF) ? DWARF2_DEBUG: SDB_DEBUG)
 
 #undef EXTRA_SECTIONS
 #define EXTRA_SECTIONS in_const, in_init, in_fini, in_ctors, in_dtors
@@ -891,11 +891,10 @@ dtors_section ()                                                  \
 
 #define MASK_COFF              010000000000    /* Mask for elf generation */
 #define TARGET_COFF             (target_flags & MASK_COFF)
-#define TARGET_ELF              (!(target_flags & MASK_COFF))
+#define TARGET_ELF              (1) /* (!(target_flags & MASK_COFF)) */
 
 #undef SUBTARGET_SWITCHES
 #define SUBTARGET_SWITCHES                                     \
-       { "coff", MASK_COFF, N_("Generate COFF output") },      \
        { "elf", -MASK_COFF, N_("Generate ELF output")  },
 
 #define NO_DOLLAR_IN_LABEL

diff --git a/gcc/config/i386/t-sco5 b/gcc/config/i386/t-sco5
index f602066..42ae7db 100644 (file)
--- a/gcc/config/i386/t-sco5
+++ b/gcc/config/i386/t-sco5
@@ -1,19 +1,14 @@
-# The pushl in CTOR initialization interferes with frame pointer elimination.
-CRTSTUFF_T_CFLAGS   = -fPIC -fno-omit-frame-pointer
-CRTSTUFF_T_CFLAGS_S = -mcoff -fno-omit-frame-pointer
+# We need to use -fPIC when we are using gcc to compile the routines in
+# crtstuff.c.  This is only really needed when we are going to use gcc/g++
+# to produce a shared library, but since we don't know ahead of time when
+# we will be doing that, we just always use -fPIC when compiling the
+# routines in crtstuff.c.  Likewise for libgcc2.c.   This is less painful
+# than multilibbing everything with PIC and PIC-not variants.
 
-#
-# I am still a little unsure of the multilib architecture. The following
-# 4 lines are based on advice from meissner@cygnus.com.
-#
-MULTILIB_OPTIONS    = mcoff/fPIC
-MULTILIB_DIRNAMES   = coff pic
-MULTILIB_EXCEPTIONS = *mcoff*/*fPIC*
-MULTILIB_MATCHES    = fPIC=fpic
-MULTILIB_EXTRA_OPTS =
+# The pushl in CTOR initialization interferes with frame pointer elimination.
 
-LIBGCC=stmp-multilib
-INSTALL_LIBGCC=install-multilib
+CRTSTUFF_T_CFLAGS   = -fPIC -fno-omit-frame-pointer
+TARGET_LIBGCC2_CFLAGS = -fPIC
 
 crti.o: $(srcdir)/config/i386/sol2-ci.asm $(GCC_PASSES)
        sed -e '/^!/d' <$(srcdir)/config/i386/sol2-ci.asm >crti.s