elf.h (STARTFILE_SPEC): Define differently if default ABI is MEABI.

2002-07-30  Chris Demetriou  <cgd@broadcom.com>

        * config/mips/elf.h (STARTFILE_SPEC): Define differently if
        default ABI is MEABI.  (Undoes incorrect change in Eric Christopher's
        patch on 2002-07-29.)
        * config/mips/elf64.h (STARTFILE_SPEC): Likewise.

From-SVN: r55894

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f8c9096c93f58afea514ae58cc9b9137d6783be..201f5282c8de6ac1df8fe6368801c031975ebcc4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-30  Chris Demetriou  <cgd@broadcom.com>
+
+       * config/mips/elf.h (STARTFILE_SPEC): Define differently if
+       default ABI is MEABI.  (Undoes incorrect change in Eric Christopher's
+       patch on 2002-07-29.)
+       * config/mips/elf64.h (STARTFILE_SPEC): Likewise.
+
 2002-07-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * alpha.h, arc.h, arm/aout.h, avr.h, cris.h, d30v.h, dsp16xx.h,

diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index 07fe78511ad1dc5bee5341ca79d5c5da3fbd31b1..692a903f91a00e273b7425da0a15d655c654a3bf 100644 (file)
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -235,7 +235,8 @@ void FN ()                                                            \
 #define LIB_SPEC ""
 
 #undef  STARTFILE_SPEC
-#ifdef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES
+#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \
+    || (MIPS_ABI_DEFAULT == ABI_MEABI)
 #define STARTFILE_SPEC "crti%O%s crtbegin%O%s"
 #else
 #define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}"

diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index 1882747fbf310451e0473b8dff8ac146f9f74e4c..b7ed0e158e58069ad9f38ad9318be00cadf89558 100644 (file)
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -193,7 +193,8 @@ void FN ()                                                            \
 #define LIB_SPEC ""
 
 #undef  STARTFILE_SPEC
-#ifdef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES
+#if defined(HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES) \
+    || (MIPS_ABI_DEFAULT == ABI_MEABI)
 #define STARTFILE_SPEC "crti%O%s crtbegin%O%s"
 #else
 #define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}"