From b0b93c8a1b782a77529d2c35a05ab770aaddb4c2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 17:56:20 -0600 Subject: gensh4: Simplify bsp_specs Updates #3250. --- c/src/lib/libbsp/sh/gensh4/bsp_specs | 6 +----- c/src/lib/libbsp/sh/gensh4/startup/linkcmds | 2 ++ c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom | 2 ++ c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh4/bsp_specs b/c/src/lib/libbsp/sh/gensh4/bsp_specs index 5151eaa41e..87638cc027 100644 --- a/c/src/lib/libbsp/sh/gensh4/bsp_specs +++ b/c/src/lib/libbsp/sh/gensh4/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} %{ml|!mb:-EL}%{mb:-EB} +%{!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/sh/gensh4/startup/linkcmds b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds index 40b764e9ff..de6bb05693 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds @@ -17,6 +17,8 @@ OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) + /* Do we need any of these for elf? __DYNAMIC = 0; */ diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom index ee61498ad3..13c6096af1 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom @@ -19,6 +19,8 @@ OUTPUT_FORMAT("elf32-shl", "elf32-shl", "elf32-shl") OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) + /* Do we need any of these for elf? __DYNAMIC = 0; */ diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram index 65656247be..cc14d4e98d 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram @@ -19,6 +19,8 @@ OUTPUT_FORMAT("elf32-shl", "elf32-shl", "elf32-shl") OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) + /* Do we need any of these for elf? __DYNAMIC = 0; */ -- cgit v1.2.3