elfos.h (ENDFILE_SPEC, [...]): Do not define.

2001-12-11  David O'Brien  <obrien@FreeBSD.org>
	* elfos.h (ENDFILE_SPEC, STARTFILE_SPEC): Do not define.
	* config/cris/cris.h (ENDFILE_SPEC): Define.
	* config/i386/i386elf.h ((ENDFILE_SPEC, STARTFILE_SPEC): Define.
	* config/pa/elf.h: Likewise.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20011211153437.A24619@redhat.com>

From-SVN: r47909

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d2a91faaaab21160bf8fe5161927adbf7aee275..10d5cbdcd76cd8f439b5f040ff4f349a4ffeed6e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-11  David O'Brien  <obrien@FreeBSD.org>
+
+       * elfos.h (ENDFILE_SPEC, STARTFILE_SPEC): Do not define.
+       * config/cris/cris.h (ENDFILE_SPEC): Define.
+       * config/i386/i386elf.h ((ENDFILE_SPEC, STARTFILE_SPEC): Define.
+       * config/pa/elf.h: Likewise.
+
 2001-12-11  Richard Henderson  <rth@redhat.com>
 
        * objc/objc-act.c (build_string_class_template): New.

diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index f97ff0b3ddf2606d87bf3ca1bdc1ae5cfd902bb8..38a92ae607cb597b1ff19a1cf1612b0ba2da2277 100644 (file)
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -231,7 +231,6 @@ extern const char *cris_elinux_stacksize_str;
    link them to crt0.o to be prepared.  Use scrt0.c if running the
    simulator, linear style, or s2crt0.c if fixed style.  */
 /* We need to remove any previous definition (elfos.h).  */
-#undef STARTFILE_SPEC
 #define STARTFILE_SPEC \
  "%{sim2:s2crt0.o%s}\
   %{!sim2:%{sim:scrt0.o%s}\
@@ -239,6 +238,8 @@ extern const char *cris_elinux_stacksize_str;
     %{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
   crtbegin.o%s"
 
+#define ENDFILE_SPEC "crtend.o%s"
+
 #define EXTRA_SPECS                            \
   {"cpp_subtarget", CRIS_CPP_SUBTARGET_SPEC},  \
   {"cc1_subtarget", CRIS_CC1_SUBTARGET_SPEC},  \

diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 33e88154af3b9c7ed92bbfeff6668ec91f44715b..003fca26d9a0940cdf6ad242f086007df1d16483 100644 (file)
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -42,15 +42,6 @@ Boston, MA 02111-1307, USA.  */
 #define MAX_OFILE_ALIGNMENT (32768 * 8)
 #endif
 
-#undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend.o%s"
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "%{!shared: \
-                        %{!symbolic: \
-                         %{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
-                       crtbegin.o%s"
-
 /* Use periods rather than dollar signs in special g++ assembler names.  */
 
 #define NO_DOLLAR_IN_LABEL

diff --git a/gcc/config/i386/i386elf.h b/gcc/config/i386/i386elf.h
index 352c3e17b7095c3ac588aba3e3a9fa5b2a7bb839..97d5fbebd0dbcdf9f9af42e15137abc49a24282a 100644 (file)
--- a/gcc/config/i386/i386elf.h
+++ b/gcc/config/i386/i386elf.h
@@ -47,6 +47,13 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_SPEC
 #define CPP_SPEC "%(cpp_cpu)"
 
+#define ENDFILE_SPEC "crtend.o%s"
+
+#define STARTFILE_SPEC "%{!shared: \
+                        %{!symbolic: \
+                         %{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
+                       crtbegin.o%s"
+
 /* This is how to output assembly code to define a `float' constant.
    We always have to use a .long pseudo-op to do this because the native
    SVR4 ELF assembler is buggy and it generates incorrect values when we

diff --git a/gcc/config/pa/elf.h b/gcc/config/pa/elf.h
index 76e8dac3d3e25482fdbd15e500d388cb76860683..db2f20fe969272ef05ae768ddd30d1c372244fb7 100644 (file)
--- a/gcc/config/pa/elf.h
+++ b/gcc/config/pa/elf.h
@@ -21,6 +21,13 @@ Boston, MA 02111-1307, USA.  */
 /* So we can conditionalize small amounts of code in pa.c or pa.md.  */
 #define OBJ_ELF
 
+#define ENDFILE_SPEC "crtend.o%s"
+
+#define STARTFILE_SPEC "%{!shared: \
+                        %{!symbolic: \
+                         %{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}\
+                       crtbegin.o%s"
+
 #define TEXT_SECTION_ASM_OP "\t.text"
 #define DATA_SECTION_ASM_OP "\t.data"
 #define BSS_SECTION_ASM_OP "\t.section\t.bss"