* config.gcc (cris-*-linux*, tm_file): Rearrange order.

	* config/cris/linux.h (LIB_SPEC, STARTFILE_SPEC): Don't redefine.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df6aec5..9b529e9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-31  Hans-Peter Nilsson  <hp@axis.com>
+
+       * config.gcc (cris-*-linux*, tm_file): Rearrange order.
+       * config/cris/linux.h (LIB_SPEC, STARTFILE_SPEC): Don't redefine.
+
 2001-10-31  Zack Weinberg  <zack@codesourcery.com>
 
        * Makefile.in (INTL_TARGETS, POSUB): Delete all references.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 2f6e7fb..41f6f2f 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -679,7 +679,7 @@ cris-*-elf | cris-*-none)
        gas=yes
        ;;
 cris-*-linux*)
-       tm_file="elfos.h svr4.h linux.h ${tm_file} cris/linux.h"
+       tm_file="elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        case x${enable_threads} in

diff --git a/gcc/config/cris/linux.h b/gcc/config/cris/linux.h
index b02e19e..54a1808 100644 (file)
--- a/gcc/config/cris/linux.h
+++ b/gcc/config/cris/linux.h
@@ -87,14 +87,6 @@ Boston, MA 02111-1307, USA.  */
 #undef CRIS_SUBTARGET_VERSION
 #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
 
-
-/* Redefine what was in svr4.h.  Include order madness makes it less
-   useful to include (config/)linux.h after cris.h.  (config/)linux.h
-   includes svr4.h which undef:s lots of supposedly arch-specific macros
-   carefully defined by cris.h.  */
-#undef LIB_SPEC
-#define LIB_SPEC "%{!shared:%{!symbolic:-lc}}"
-
 /* We need an -rpath-link to ld.so.1, and presumably to each directory
    specified with -B.  */
 #undef CRIS_LINK_SUBTARGET_SPEC
@@ -106,19 +98,6 @@ Boston, MA 02111-1307, USA.  */
   %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
   %{O2|O3: --gc-sections}"
 
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC \
- "%{!shared:\
-   %{pg:gcrt1.o%s}\
-   %{!pg:\
-    %{p:gcrt1.o%s}\
-    %{!p:\
-     %{profile:gcrt1.o%s}\
-     %{!profile:crt1.o%s}}}}\
-  crti.o%s\
-  %{!shared:crtbegin.o%s}\
-  %{shared:crtbeginS.o%s}"
-
 
 /* Node: Sections */