From 5aea39b7c79531481febcc039f8aed7a855bad5e Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 6 Nov 2009 14:26:38 +0000
Subject: =?UTF-8?q?2009-11-06=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* configure.ac: Add RTEMS_BSP_LINKCMDS.
	* Makefile.am: Rework linkcmds handling.
	* make/custom/tqm8xx.inc: Remove RTEMS_LINKCMDS, LDFLAGS.
---
 c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog              | 6 ++++++
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am            | 5 +++--
 c/src/lib/libbsp/powerpc/tqm8xx/configure.ac           | 1 +
 c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc | 3 ---
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
index 36d716267f..0920fed553 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-06	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Add RTEMS_BSP_LINKCMDS.
+	* Makefile.am: Rework linkcmds handling.
+	* make/custom/tqm8xx.inc: Remove RTEMS_LINKCMDS, LDFLAGS.
+
 2009-11-03	Thomas Doerfler  <Thomas.Doerfler@embedded-brains.de>
 
 	* startup/bspstart.c, console/console.c: various fixes
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index b73416dfb0..645e2a5a91 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -34,8 +34,9 @@ project_lib_DATA = start.$(OBJEXT)
 libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds.base \
-    startup/linkcmds.tqm8xx
+project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.base
+EXTRA_DIST += startup/linkcmds.tqm8xx
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
index e1e7c063d1..b78ffaf15a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
@@ -107,6 +107,7 @@ RTEMS_BSPOPTS_HELP([BSP_USE_NETWORK_SCC],
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
+RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc b/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc
index b06681f8f5..119bc2859e 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/make/custom/tqm8xx.inc
@@ -14,9 +14,6 @@ CPU_CFLAGS = -mcpu=860 -Dmpc860 \
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
 
-RTEMS_LINKCMDS=linkcmds.tqm8xx
-LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS)
-
 define bsp-post-link
 	cp $(basename $@).exe $(basename $@)$(DOWNEXT) 
 	$(STRIP) $(basename $@)$(DOWNEXT)
-- 
cgit v1.2.3