From 229286564305645fdf37686495cde7f55d823f03 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Mon, 27 Nov 2017 09:53:52 -0600
Subject: REVERT */*/bsp_specs: Increase similarity to ease future

Patch was not intended to be pushed yet.

Updates #3520.
---
 c/src/lib/libbsp/bfin/TLL6527M/bsp_specs            |  2 +-
 c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs          |  2 +-
 c/src/lib/libbsp/bfin/eZKit533/bsp_specs            |  2 +-
 c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs    |  2 +-
 c/src/lib/libbsp/i386/pc386/bsp_specs               |  6 +++---
 c/src/lib/libbsp/m32c/m32cbsp/bsp_specs             |  8 +++++---
 c/src/lib/libbsp/mips/hurricane/bsp_specs           |  6 +++---
 c/src/lib/libbsp/moxie/moxiesim/bsp_specs           |  4 +---
 c/src/lib/libbsp/nios2/nios2_iss/bsp_specs          |  2 +-
 c/src/lib/libbsp/or1k/generic_or1k/bsp_specs        |  2 +-
 c/src/lib/libbsp/powerpc/beatnik/bsp_specs          |  6 +++---
 c/src/lib/libbsp/powerpc/gen83xx/bsp_specs          |  4 ++--
 c/src/lib/libbsp/powerpc/haleakala/bsp_specs        |  4 ++--
 c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs |  6 +++---
 c/src/lib/libbsp/powerpc/mvme3100/bsp_specs         |  6 +++---
 c/src/lib/libbsp/powerpc/mvme5500/bsp_specs         |  6 +++---
 c/src/lib/libbsp/powerpc/psim/bsp_specs             |  6 +++---
 c/src/lib/libbsp/powerpc/qemuppc/bsp_specs          |  6 +++---
 c/src/lib/libbsp/powerpc/qoriq/bsp_specs            |  5 +++--
 c/src/lib/libbsp/powerpc/virtex/bsp_specs           |  3 ++-
 c/src/lib/libbsp/riscv/riscv_generic/bsp_specs      |  2 +-
 c/src/lib/libbsp/sparc/erc32/bsp_specs              |  6 +++---
 c/src/lib/libbsp/sparc/leon2/bsp_specs              |  6 +++---
 c/src/lib/libbsp/sparc/leon3/bsp_specs              |  6 +++---
 c/src/lib/libbsp/sparc64/niagara/bsp_specs          | 10 ++++++----
 c/src/lib/libbsp/sparc64/usiii/bsp_specs            | 10 ++++++----
 c/src/lib/libbsp/v850/gdbv850sim/bsp_specs          |  8 +++++---
 27 files changed, 72 insertions(+), 64 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs b/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs
index c2f80ebf2b..32c5f572cc 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs
+++ b/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs b/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs
index c2f80ebf2b..32c5f572cc 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs b/c/src/lib/libbsp/bfin/eZKit533/bsp_specs
index c2f80ebf2b..32c5f572cc 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs
+++ b/c/src/lib/libbsp/bfin/eZKit533/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs b/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs
index 975c0b2b51..082653ad22 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: *(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/i386/pc386/bsp_specs b/c/src/lib/libbsp/i386/pc386/bsp_specs
index 5154de8c55..0b334ed140 100644
--- a/c/src/lib/libbsp/i386/pc386/bsp_specs
+++ b/c/src/lib/libbsp/i386/pc386/bsp_specs
@@ -2,12 +2,12 @@
 %rename startfile old_startfile
 %rename link old_link
 
+*endfile:
+crtend.o%s crtn.o%s
+
 *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}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs b/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs
index bd44bf8af9..640e73a53d 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs
+++ b/c/src/lib/libbsp/m32c/m32cbsp/bsp_specs
@@ -6,8 +6,10 @@
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: start.o%s crtbegin.o%s -e _start}}
 
+*endfile:
+%{!qrtems: %(old_endfile)} \
+%{!nostdlib: %{qrtems: crtend.o%s}}
+
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s}}
diff --git a/c/src/lib/libbsp/mips/hurricane/bsp_specs b/c/src/lib/libbsp/mips/hurricane/bsp_specs
index 17cdbf8dfd..1105851c41 100644
--- a/c/src/lib/libbsp/mips/hurricane/bsp_specs
+++ b/c/src/lib/libbsp/mips/hurricane/bsp_specs
@@ -3,11 +3,11 @@
 %rename link old_link
 
 *startfile:
-%{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
+%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: \
+start.o%s crti.o%s crtbegin.o%s -e start}}
 
 *link:
 %(old_link) %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/moxie/moxiesim/bsp_specs b/c/src/lib/libbsp/moxie/moxiesim/bsp_specs
index d3e0ec0085..0bcb1f9ac5 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/bsp_specs
+++ b/c/src/lib/libbsp/moxie/moxiesim/bsp_specs
@@ -7,7 +7,5 @@
 %{!nostdlib: %{qrtems: start.o%s -e _start crtbegin.o%s}}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%(old_link) %{!qrtems: %(old_link)} %{qrtems: crtend.o%s -dc -dp -N}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s}}
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs b/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
index 5154de8c55..b2145b11fa 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
+++ b/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtnn.o%s}
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs b/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
index 975c0b2b51..082653ad22 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
+++ b/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: *(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs b/c/src/lib/libbsp/powerpc/beatnik/bsp_specs
index c6647045a9..3c859d1d66 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/beatnik/bsp_specs
@@ -6,8 +6,8 @@
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems:  ecrti%O%s rtems_crti%O%s crtbegin.o%s -e __rtems_entry_point -u __vectors motld_start.o%s}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs b/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs
index a105a01260..92f6c582e8 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs
@@ -4,11 +4,11 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s start.o%s}}
+%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s  crtbegin.o%s start.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -u __vectors}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -N}
 
diff --git a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs b/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
index 23b58cd4e0..9102ad7442 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
@@ -3,11 +3,11 @@
 %rename link old_link
 
 *startfile:
-%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s}}
+%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems:  ecrti%O%s rtems_crti%O%s  crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -u __vectors -u download_entry}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -u download_entry -N }
 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
index 2a245e9a66..5df5bd5f88 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
@@ -7,8 +7,8 @@
 %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s \
   vectors_entry%O%s start.o%s -e __rtems_entry_point -u __vectors}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs b/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs
index c6647045a9..3c859d1d66 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs
@@ -6,8 +6,8 @@
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems:  ecrti%O%s rtems_crti%O%s crtbegin.o%s -e __rtems_entry_point -u __vectors motld_start.o%s}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs b/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs
index 9528d878e6..8dbdcf230d 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs
@@ -6,8 +6,8 @@
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s -e __rtems_entry_point -u __vectors mvme5500start.o%s}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/psim/bsp_specs b/c/src/lib/libbsp/powerpc/psim/bsp_specs
index c8762610a3..7a636bbb07 100644
--- a/c/src/lib/libbsp/powerpc/psim/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/psim/bsp_specs
@@ -7,8 +7,8 @@
 %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s \
     start.o%s -e _start -u __vectors}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs b/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs
index c8762610a3..7a636bbb07 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs
@@ -7,8 +7,8 @@
 %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s \
     start.o%s -e _start -u __vectors}}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic}
+
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
diff --git a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs b/c/src/lib/libbsp/powerpc/qoriq/bsp_specs
index 6e5bb08844..8b4545f621 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/qoriq/bsp_specs
@@ -4,10 +4,11 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s start.o%s}}
+%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s  crtbegin.o%s start.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s rtems_crtn.o%s ecrtn.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -u __vectors %(link_os)}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -N %(link_os)}
+
diff --git a/c/src/lib/libbsp/powerpc/virtex/bsp_specs b/c/src/lib/libbsp/powerpc/virtex/bsp_specs
index bfa43f384d..92f6c582e8 100644
--- a/c/src/lib/libbsp/powerpc/virtex/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/virtex/bsp_specs
@@ -10,4 +10,5 @@
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -u __vectors}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -N}
+
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs b/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs
index 975c0b2b51..32c105fd0f 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs
+++ b/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs
@@ -10,4 +10,4 @@
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s }
diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/bsp_specs
index 7cff0f369c..66bb283902 100644
--- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
+++ b/c/src/lib/libbsp/sparc/erc32/bsp_specs
@@ -2,12 +2,12 @@
 %rename startfile old_startfile
 %rename link old_link
 
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+
 *startfile:
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/sparc/leon2/bsp_specs b/c/src/lib/libbsp/sparc/leon2/bsp_specs
index 7cff0f369c..d79b2b4ccc 100644
--- a/c/src/lib/libbsp/sparc/leon2/bsp_specs
+++ b/c/src/lib/libbsp/sparc/leon2/bsp_specs
@@ -2,12 +2,12 @@
 %rename startfile old_startfile
 %rename link old_link
 
+*endfile:
+crtend.o%s crtn.o%s
+
 *startfile:
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/sparc/leon3/bsp_specs b/c/src/lib/libbsp/sparc/leon3/bsp_specs
index 7cff0f369c..d79b2b4ccc 100644
--- a/c/src/lib/libbsp/sparc/leon3/bsp_specs
+++ b/c/src/lib/libbsp/sparc/leon3/bsp_specs
@@ -2,12 +2,12 @@
 %rename startfile old_startfile
 %rename link old_link
 
+*endfile:
+crtend.o%s crtn.o%s
+
 *startfile:
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/bsp_specs
index c2f4ae1164..640e73a53d 100644
--- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/niagara/bsp_specs
@@ -4,10 +4,12 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}}
+%{!nostdlib: %{qrtems: start.o%s crtbegin.o%s -e _start}}
+
+*endfile:
+%{!qrtems: %(old_endfile)} \
+%{!nostdlib: %{qrtems: crtend.o%s}}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s crtn.o%s}}
diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/bsp_specs
index c2f4ae1164..640e73a53d 100644
--- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/usiii/bsp_specs
@@ -4,10 +4,12 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}}
+%{!nostdlib: %{qrtems: start.o%s crtbegin.o%s -e _start}}
+
+*endfile:
+%{!qrtems: %(old_endfile)} \
+%{!nostdlib: %{qrtems: crtend.o%s}}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s crtn.o%s}}
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs b/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs
index 0f4bd0adfa..bb7833b2ad 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs
+++ b/c/src/lib/libbsp/v850/gdbv850sim/bsp_specs
@@ -6,8 +6,10 @@
 %{!qrtems: %(old_startfile)} \
 %{!nostdlib: %{qrtems: start.o%s -e _start}}
 
+*endfile:
+%{!qrtems: %(old_endfile)} %{qrtems: %(old_endfile)} \
+%{!nostdlib: %{qrtems:}}
+
 *link:
-%{!qrtems: %(old_link)} %{qrtems: %(old_link)}
+%(old_link) %{!qrtems: %(old_link)} %{qrtems: %(old_link)}
 
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: %(old_link)}
-- 
cgit v1.2.3