From be7ee6587ac8009c6e89194233c19babecc302e3 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Wed, 20 Dec 2017 14:14:45 -0600
Subject: haleakala: Simplify bsp_specs

Updates #3520.
---
 c/src/lib/libbsp/powerpc/haleakala/bsp_specs        | 7 ++-----
 c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'c/src/lib/libbsp/powerpc/haleakala')

diff --git a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs b/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
index 23b58cd4e0..5752caaca0 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/haleakala/bsp_specs
@@ -1,13 +1,10 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
-%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s}}
+%{!qrtems: %(old_startfile)} \
+%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
 
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -u __vectors -u download_entry}
-
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds b/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
index 2be24329f8..8c06a5103b 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
@@ -12,6 +12,7 @@
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
 ENTRY(download_entry)
+EXTERN(__vectors)
 
 kIntrStackSize = 16K;
 kMainStackSize = 64K;
-- 
cgit v1.2.3