From b228f55e074f971df8cca21bdad83f69b60c50af Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 14:46:58 -0600 Subject: riscv_generic: Simplify bsp_specs Updates #3520. --- c/src/lib/libbsp/riscv/riscv_generic/bsp_specs | 6 +----- c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs b/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs index 975c0b2b51..87638cc027 100644 --- a/c/src/lib/libbsp/riscv/riscv_generic/bsp_specs +++ b/c/src/lib/libbsp/riscv/riscv_generic/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/riscv/riscv_generic/startup/linkcmds b/c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds index 14e6f4c245..fad1d1e1d2 100644 --- a/c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds +++ b/c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds @@ -36,6 +36,7 @@ OUTPUT_ARCH (riscv) ENTRY (_start) +STARTUP (start.o) MEMORY { -- cgit v1.2.3