From 205b19ea1db2b44dc704ba7376f341d01572ad8c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 16:14:10 -0600 Subject: sparc64 BSPs: Simplify bsp_specs Updates #3520. --- c/src/lib/libbsp/sparc64/niagara/bsp_specs | 6 +----- c/src/lib/libbsp/sparc64/shared/startup/linkcmds | 3 ++- c/src/lib/libbsp/sparc64/usiii/bsp_specs | 6 +----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/bsp_specs index c2f4ae1164..0b4b0db932 100644 --- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs +++ b/c/src/lib/libbsp/sparc64/niagara/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)} %{!nostdlib: %{qrtems: crtend.o%s crtn.o%s}} diff --git a/c/src/lib/libbsp/sparc64/shared/startup/linkcmds b/c/src/lib/libbsp/sparc64/shared/startup/linkcmds index 24e0a0147d..2f9db3a087 100644 --- a/c/src/lib/libbsp/sparc64/shared/startup/linkcmds +++ b/c/src/lib/libbsp/sparc64/shared/startup/linkcmds @@ -18,7 +18,8 @@ RAM_END = RamBase + RamSize; /* Default linker script, for normal executables */ OUTPUT_FORMAT("elf64-sparc") -ENTRY(start) +ENTRY(_start) +STARTUP(start.o) MEMORY { diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/bsp_specs index c2f4ae1164..0b4b0db932 100644 --- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs +++ b/c/src/lib/libbsp/sparc64/usiii/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)} %{!nostdlib: %{qrtems: crtend.o%s crtn.o%s}} -- cgit v1.2.3