Reformat FBSD_{START,END}FILE_SPEC to FSF coding standards.

Use these in our i386, amd64, and alpha platforms.

3 files changed, 33 insertions, 45 deletions

diff --git a/contrib/gcc/config/alpha/freebsd.h b/contrib/gcc/config/alpha/freebsd.h
index 82428d0..4bfe666 100644
--- a/contrib/gcc/config/alpha/freebsd.h
+++ b/contrib/gcc/config/alpha/freebsd.h
@@ -54,14 +54,11 @@ Boston, MA 02111-1307, USA.  */
       %{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}}		\
     %{static:-Bstatic}}"
 
-/* We now have to provide a STARTFILE_SPEC because of a moronic pigheaded
+/* Reset our STARTFILE_SPEC because of a moronic pigheaded
    Linuxism(glibc'ism) that was added to alpha/elf.h.  */
 
- #undef	 STARTFILE_SPEC
- #define STARTFILE_SPEC \
-   "%{!shared: \
-      %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}}\
-   crti.o%s %{shared:crtbeginS.o%s}%{!shared:crtbegin.o%s}"
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC FBSD_STARTFILE_SPEC
 
 
 /************************[  Target stuff  ]***********************************/
diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h
index 3dee03b..42311f2 100644
--- a/contrib/gcc/config/freebsd-spec.h
+++ b/contrib/gcc/config/freebsd-spec.h
@@ -101,26 +101,31 @@ Boston, MA 02111-1307, USA.  */
   %{!ansi:%{!std=c89:%{!std=iso9899.1990:%{!std=iso9899.199409:-D_LONGLONG}}}} \
   %{posix:-D_POSIX_SOURCE}"
 
-/* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
-   the magical crtbegin.o file (see crtstuff.c) which provides part 
-	of the support for getting C++ file-scope static object constructed 
-	before entering `main'.  */
+/* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add the magical
+   crtbegin.o file (see crtstuff.c) which provides part of the support for
+   getting C++ file-scope static object constructed before entering `main'.  */
    
-#define FBSD_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}"
-
-/* Provide a ENDFILE_SPEC appropriate for FreeBSD.  Here we tack on
-   the magical crtend.o file (see crtstuff.c) which provides part of 
-	the support for getting C++ file-scope static object constructed 
-	before entering `main', followed by a normal "finalizer" file, 
-	`crtn.o'.  */
-
-#define FBSD_ENDFILE_SPEC \
-  " %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s "
+#define FBSD_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}"
+
+/* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  Here we tack on
+   our own magical crtend.o file (see crtstuff.c) which provides part of
+   the support for getting C++ file-scope static object constructed before
+   entering `main', followed by the normal "finalizer" file, `crtn.o'.  */
+
+#define FBSD_ENDFILE_SPEC "\
+  %{!shared:crtend.o%s} \
+  %{shared:crtendS.o%s} \
+  crtn.o%s "
 
 /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as
    required by the user-land thread model.  Before __FreeBSD_version
diff --git a/contrib/gcc/config/i386/freebsd.h b/contrib/gcc/config/i386/freebsd.h
index b6ec571..be9729c 100644
--- a/contrib/gcc/config/i386/freebsd.h
+++ b/contrib/gcc/config/i386/freebsd.h
@@ -58,30 +58,16 @@ Boston, MA 02111-1307, USA.  */
       %{static:-Bstatic}} \
     %{symbolic:-Bsymbolic}"
 
-/* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add the magical
-   crtbegin.o file (see crtstuff.c) which provides part of the support for
-   getting C++ file-scope static object constructed before entering `main'.  */
+/* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
+   but trashed by config/<cpu>/<file.h>. */
 
 #undef STARTFILE_SPEC
-#define STARTFILE_SPEC "\
-    %{!shared: \
-      %{pg:gcrt1.o%s} \
-      %{!pg: \
-	%{p:gcrt1.o%s} \
-	%{!p:crt1.o%s}}} \
-    crti.o%s \
-    %{!shared:crtbegin.o%s} \
-    %{shared:crtbeginS.o%s}"
-
-/* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  Here we tack on our
-   own magical crtend.o file (see crtstuff.c) which provides part of the
-   support for getting C++ file-scope static object constructed before
-   entering `main', followed by the normal "finalizer" file, `crtn.o'.  */
+#define STARTFILE_SPEC FBSD_STARTFILE_SPEC
+
+/* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  */
 
 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "\
-    %{!shared:crtend.o%s} \
-    %{shared:crtendS.o%s} crtn.o%s"
+#define ENDFILE_SPEC FBSD_ENDFILE_SPEC
 
 
 /************************[  Target stuff  ]***********************************/