From 169d86f3b1f43ee80384ec4b2d4e5fe8a9a32f42 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 28 Nov 2017 11:57:48 -0600
Subject: sparc64/*/bsp_specs, shared/.../start.S: Use GCC init/fini, improve
 consistency

Updates #3520.
---
 c/src/lib/libbsp/sparc64/niagara/bsp_specs    | 10 ++++------
 c/src/lib/libbsp/sparc64/shared/start/start.S | 14 --------------
 c/src/lib/libbsp/sparc64/usiii/bsp_specs      | 10 ++++------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/bsp_specs
index 640e73a53d..c2f4ae1164 100644
--- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/niagara/bsp_specs
@@ -4,12 +4,10 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crtbegin.o%s -e _start}}
-
-*endfile:
-%{!qrtems: %(old_endfile)} \
-%{!nostdlib: %{qrtems: crtend.o%s}}
+%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}}
 
 *link:
-%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!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/shared/start/start.S b/c/src/lib/libbsp/sparc64/shared/start/start.S
index 56ecc05079..92c2177c1e 100644
--- a/c/src/lib/libbsp/sparc64/shared/start/start.S
+++ b/c/src/lib/libbsp/sparc64/shared/start/start.S
@@ -149,17 +149,3 @@ halted:	nop
   .align CPU_ALIGNMENT
   param_space:
   	.space 8
-
-.section .fini
-  .global _fini
-  _fini:
-    nop
-    retl
-    nop
-
-.section .init
-  .global _init
-  _init:
-    nop
-    retl
-    nop
diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/bsp_specs
index 640e73a53d..c2f4ae1164 100644
--- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/usiii/bsp_specs
@@ -4,12 +4,10 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crtbegin.o%s -e _start}}
-
-*endfile:
-%{!qrtems: %(old_endfile)} \
-%{!nostdlib: %{qrtems: crtend.o%s}}
+%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}}
 
 *link:
-%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
 
+*endfile:
+%{!qrtems: %(old_endfile)} %{!nostdlib: %{qrtems: crtend.o%s crtn.o%s}}
-- 
cgit v1.2.3