From 00aea01961550b43a902123683bec6b143a3aea3 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 19 Dec 2017 09:50:28 -0600
Subject: genmcf548x, mvme147, mvme147s, mvme162, mvme167: Simplify bsp_specs

These BSPs used shared/startup/linkcmds.base and had to be modified
as a set.

Updates #3520.
---
 c/src/lib/libbsp/m68k/genmcf548x/bsp_specs         | 7 ++-----
 c/src/lib/libbsp/m68k/mvme147/bsp_specs            | 7 ++-----
 c/src/lib/libbsp/m68k/mvme147s/bsp_specs           | 7 ++-----
 c/src/lib/libbsp/m68k/mvme162/bsp_specs            | 6 +-----
 c/src/lib/libbsp/m68k/mvme167/bsp_specs            | 6 +-----
 c/src/lib/libbsp/m68k/shared/startup/linkcmds.base | 1 +
 6 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs b/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
index 5154de8c55..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
+++ b/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
@@ -1,13 +1,10 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+
diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
index 5154de8c55..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
@@ -1,13 +1,10 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+
diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
index 5154de8c55..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
@@ -1,13 +1,10 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+
diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
index 5154de8c55..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
@@ -1,13 +1,9 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/m68k/mvme167/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/bsp_specs
index 5154de8c55..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme167/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme167/bsp_specs
@@ -1,13 +1,9 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base b/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base
index 0e888e104c..5af4f91c90 100644
--- a/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base
+++ b/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base
@@ -17,6 +17,7 @@ OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
 
 ENTRY(_start)
+STARTUP(start.o)
 
 bsp_initstack_size = DEFINED (bsp_initstack_size) ? bsp_initstack_size : 2048;
 
-- 
cgit v1.2.3