From 5a1fab22383f5c59bdd58a01d6a5f70d50c66173 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 17:54:54 -0600 Subject: gensh2: Simplify bsp_specs Updates #3250. --- c/src/lib/libbsp/sh/gensh2/bsp_specs | 6 +----- c/src/lib/libbsp/sh/gensh2/startup/linkcmds | 1 + c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram | 2 +- c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp/sh') diff --git a/c/src/lib/libbsp/sh/gensh2/bsp_specs b/c/src/lib/libbsp/sh/gensh2/bsp_specs index 975c0b2b51..87638cc027 100644 --- a/c/src/lib/libbsp/sh/gensh2/bsp_specs +++ b/c/src/lib/libbsp/sh/gensh2/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/sh/gensh2/startup/linkcmds b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds index d58f25e48f..2c4d44a941 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds @@ -39,6 +39,7 @@ OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) /* These assignments load code into SH7045F EVB SRAM for monitor debugging */ diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram index d7449077da..c5349398ff 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram +++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram @@ -37,9 +37,9 @@ * by the authors or by TGA Technologies. */ -OUTPUT_FORMAT("coff-sh") OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) /* These assignments load code into SH7045F EVB SRAM for monitor debugging */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x00440000; diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom index c59613b3f2..4934c10269 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom +++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom @@ -37,9 +37,9 @@ * by the authors or by TGA Technologies. */ -OUTPUT_FORMAT("coff-sh") OUTPUT_ARCH(sh) ENTRY(_start) +STARTUP(start.o) /* These asignments represent actual SH7045F EVB architecture */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x00400000; -- cgit v1.2.3