From 5ca6d2599ee761616d7c1ddfc93c617414ce8778 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 14:33:33 -0600 Subject: nios2_iss: Simplify bsp_specs Updates #3520. --- c/src/lib/libbsp/nios2/nios2_iss/bsp_specs | 6 +----- c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp/nios2') diff --git a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs b/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs index 5154de8c55..87638cc027 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs +++ b/c/src/lib/libbsp/nios2/nios2_iss/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/nios2/nios2_iss/startup/linkcmds b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds index f3a1dd39d6..c08c37628a 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds +++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds @@ -45,7 +45,8 @@ OUTPUT_FORMAT( "elf32-littlenios2", "elf32-littlenios2", "elf32-littlenios2" ) OUTPUT_ARCH( nios2 ) -ENTRY( _start ) +ENTRY(start) +STARTUP(start.o) /* Do we need any of these for elf? __DYNAMIC = 0; -- cgit v1.2.3