FIXME Simplify linkcmds handling

84 files changed, 83 insertions, 38 deletions

diff --git a/c/src/aclocal/bsp-linkcmds.m4 b/c/src/aclocal/bsp-linkcmds.m4
index 397609f6e0..3e40638f88 100644
--- a/c/src/aclocal/bsp-linkcmds.m4
+++ b/c/src/aclocal/bsp-linkcmds.m4
@@ -13,5 +13,5 @@ done
 AS_IF([test -z "${LINKCMDS}"],[
   AC_MSG_ERROR([can not determine linkcmds])])
 
-AC_CONFIG_LINKS([startup/linkcmds:${LINKCMDS}])
+AC_CONFIG_LINKS([linkcmds:${LINKCMDS}])
 ])
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
index 1d65920bab..e05f119976 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/altcycv_devkit.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/atsam/configure.ac b/c/src/lib/libbsp/arm/atsam/configure.ac
index 219aca7ff7..2ade9f11df 100644
--- a/c/src/lib/libbsp/arm/atsam/configure.ac
+++ b/c/src/lib/libbsp/arm/atsam/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([make/custom/atsamv.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/beagle/configure.ac b/c/src/lib/libbsp/arm/beagle/configure.ac
index 55b5720c69..bcfc556ba0 100644
--- a/c/src/lib/libbsp/arm/beagle/configure.ac
+++ b/c/src/lib/libbsp/arm/beagle/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/beagleboardorig.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.11.1])
diff --git a/c/src/lib/libbsp/arm/csb336/configure.ac b/c/src/lib/libbsp/arm/csb336/configure.ac
index aa5c2c2c07..11ccabf036 100644
--- a/c/src/lib/libbsp/arm/csb336/configure.ac
+++ b/c/src/lib/libbsp/arm/csb336/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/csb336.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/csb337/configure.ac b/c/src/lib/libbsp/arm/csb337/configure.ac
index f5b9e3418f..066d425e56 100644
--- a/c/src/lib/libbsp/arm/csb337/configure.ac
+++ b/c/src/lib/libbsp/arm/csb337/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/csb337.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac
index b069e6bb86..63c78230f2 100644
--- a/c/src/lib/libbsp/arm/edb7312/configure.ac
+++ b/c/src/lib/libbsp/arm/edb7312/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/edb7312.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
index c3c17b7db0..b5385d98c4 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
+++ b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/arm1136jfs.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/gumstix/configure.ac b/c/src/lib/libbsp/arm/gumstix/configure.ac
index dfe3d8aab3..299085bb17 100644
--- a/c/src/lib/libbsp/arm/gumstix/configure.ac
+++ b/c/src/lib/libbsp/arm/gumstix/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gumstix.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/imx/configure.ac b/c/src/lib/libbsp/arm/imx/configure.ac
index e39f713158..318c4e9c10 100644
--- a/c/src/lib/libbsp/arm/imx/configure.ac
+++ b/c/src/lib/libbsp/arm/imx/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([make/custom/imx7.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
index 3a8e101445..b02e213b40 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/lm3s3749.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/lpc176x/configure.ac b/c/src/lib/libbsp/arm/lpc176x/configure.ac
index 50ac73bc59..b64bef7463 100644
--- a/c/src/lib/libbsp/arm/lpc176x/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc176x/configure.ac
@@ -12,6 +12,7 @@ AC_CONFIG_SRCDIR([make/custom/lpc1768_mbed_ahb_ram.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
index 20752b1093..50b654fd8e 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/lpc17xx_ea_ram.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/lpc32xx/configure.ac b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
index 3c876cdd91..1383d97c89 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/lpc32xx_mzx.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
index 2c1d1c8ceb..97e74d9a42 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac
+++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
@@ -60,5 +60,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
index 3bd8e95171..8674da3e5a 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/realview_pbx_a9_qemu.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/rtl22xx/configure.ac b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
index fd3d186df1..d8e7930004 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/configure.ac
+++ b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/rtl22xx.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/smdk2410/configure.ac b/c/src/lib/libbsp/arm/smdk2410/configure.ac
index 5cb0a89283..c4dcf1d44d 100644
--- a/c/src/lib/libbsp/arm/smdk2410/configure.ac
+++ b/c/src/lib/libbsp/arm/smdk2410/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/smdk2410.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/stm32f4/configure.ac b/c/src/lib/libbsp/arm/stm32f4/configure.ac
index 21179f6e7c..980a2acf79 100644
--- a/c/src/lib/libbsp/arm/stm32f4/configure.ac
+++ b/c/src/lib/libbsp/arm/stm32f4/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([make/custom/stm32f4.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/tms570/configure.ac b/c/src/lib/libbsp/arm/tms570/configure.ac
index 0d689efb1d..8a3789f5f2 100644
--- a/c/src/lib/libbsp/arm/tms570/configure.ac
+++ b/c/src/lib/libbsp/arm/tms570/configure.ac
@@ -12,6 +12,7 @@ AC_CONFIG_SRCDIR([make/custom/tms570ls3137_hdk.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
index 149ea36594..f5a0af51bf 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
@@ -151,5 +151,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
index e15493e205..7fcdf6f904 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
+++ b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/TLL6527M.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
index cc921150a0..9628cbfad0 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/bf537Stamp.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/eZKit533/configure.ac b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
index f1c6766ace..63eb2766c9 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/configure.ac
+++ b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/eZKit533.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
index e0b0307971..b5448a7ae3 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/epiphany_sim.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign subdir-objects 1.12.2])
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index c08f8f40ee..74cf64c493 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/pc386.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
index c555b77f8d..93426ffdbc 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
+++ b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/lm32_evr.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/milkymist/configure.ac b/c/src/lib/libbsp/lm32/milkymist/configure.ac
index 86e22b8ee6..7bd05a6edd 100644
--- a/c/src/lib/libbsp/lm32/milkymist/configure.ac
+++ b/c/src/lib/libbsp/lm32/milkymist/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/milkymist.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
index 2238716b5e..2037af8d87 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
+++ b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/m32csim.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac
index f8e962925e..4d5e885e95 100644
--- a/c/src/lib/libbsp/m68k/av5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/av5282/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/av5282.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac
index cca659d511..74cdcdeb49 100644
--- a/c/src/lib/libbsp/m68k/csb360/configure.ac
+++ b/c/src/lib/libbsp/m68k/csb360/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/csb360.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac
index a1ef621bae..a984f2dc35 100644
--- a/c/src/lib/libbsp/m68k/gen68340/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gen68340.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac
index 67d7534290..5a0e72cb21 100644
--- a/c/src/lib/libbsp/m68k/gen68360/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gen68360.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
index 763a12b7bb..d7ec6702b9 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
+++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/COBRA5475.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
index 3bd340e12c..ccb3625138 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcf5206elite.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
index e815c1c2ee..da0b172536 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcf52235.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
index 470c54e66c..fab934b3f5 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcf5225x.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
index 5f5100d380..07838cd677 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcf5235.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
index f4d41ae35a..99eb6f5ea4 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcf5329.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac
index 79c50cf67f..c8fb1c1ac3 100644
--- a/c/src/lib/libbsp/m68k/mrm332/configure.ac
+++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mrm332.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac
index 31f7c2247b..eaec21faa9 100644
--- a/c/src/lib/libbsp/m68k/mvme147/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme147.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
index 9b1f8dcb85..14f9a8bac5 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme147s.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac
index fd067c0bb7..aef42983a9 100644
--- a/c/src/lib/libbsp/m68k/mvme162/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme162.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac
index 6d84f472ed..20120fc1b9 100644
--- a/c/src/lib/libbsp/m68k/mvme167/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme167.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac
index 0d4e5c6fc7..3025976b40 100644
--- a/c/src/lib/libbsp/m68k/uC5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/uC5282.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/csb350/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac
index ef29144ea8..ca7f3dc11d 100644
--- a/c/src/lib/libbsp/mips/csb350/configure.ac
+++ b/c/src/lib/libbsp/mips/csb350/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/csb350.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/hurricane/configure.ac b/c/src/lib/libbsp/mips/hurricane/configure.ac
index 50fb02ead8..99d16d95b8 100644
--- a/c/src/lib/libbsp/mips/hurricane/configure.ac
+++ b/c/src/lib/libbsp/mips/hurricane/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/hurricane.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/jmr3904/configure.ac b/c/src/lib/libbsp/mips/jmr3904/configure.ac
index 85469c8c1d..7fc9bbd0cd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/configure.ac
+++ b/c/src/lib/libbsp/mips/jmr3904/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/jmr3904.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/malta/configure.ac b/c/src/lib/libbsp/mips/malta/configure.ac
index 68fc5fdda2..6633da14fe 100644
--- a/c/src/lib/libbsp/mips/malta/configure.ac
+++ b/c/src/lib/libbsp/mips/malta/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/malta.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/rbtx4925/configure.ac b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
index 0eecb41500..b99751d8f4 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/rbtx4925.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/rbtx4938/configure.ac b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
index e22a435b00..e48c697695 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/rbtx4938.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/moxie/moxiesim/configure.ac b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
index 9ac47bcb45..23dda64126 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/configure.ac
+++ b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_SRCDIR([make/custom/moxiesim.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
index 95f35ddada..2dd6eb202b 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
+++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/nios2_iss.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
index daa263868b..f39164358a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/no_bsp.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
index 25bcc6f359..d519fc4381 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_SRCDIR([make/custom/generic_or1k.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/beatnik/configure.ac b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
index d8a6fa1371..2c6a813fa5 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/configure.ac
+++ b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/beatnik.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index bf9c992bdb..b5cf38f8de 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/brs5l.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
index f555c106be..fd96450522 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/br_uid.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/haleakala/configure.ac b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
index 92c16db812..c6b116f234 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/configure.ac
+++ b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/haleakala.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 6a0c4ca66d..8dd21e4d68 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mcp750.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index a893a287ab..f32c89e8fb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -13,6 +13,7 @@ AC_CONFIG_SRCDIR([make/custom/gwlcfm.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
index 939026ea3e..96a4af7697 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mpc8260ads.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
index 3c70b03882..ec58a87c88 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme3100.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
index 4b0974e3c9..5da9add985 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/mvme5500.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac
index d9e69d0171..11f58874e3 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.ac
+++ b/c/src/lib/libbsp/powerpc/psim/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/psim.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
index d509d8fbda..0dab820017 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/qemuppc.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
index 52e28d4637..02fffa7e7a 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([make/custom/qoriq_core_0.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac
index 1002eaf71f..159755d8eb 100644
--- a/c/src/lib/libbsp/powerpc/ss555/configure.ac
+++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/ss555.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
index f19c60656e..bb86f6149d 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_SRCDIR([make/custom/t32mppc.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
index f83cb67c73..57216624f1 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/pghplus.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac
index 4edc6a193d..8c910b5b3a 100644
--- a/c/src/lib/libbsp/powerpc/virtex/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac
@@ -47,7 +47,7 @@ RTEMS_BSP_CLEANUP_OPTIONS
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds
+linkcmds:startup/linkcmds.in
 ])
 
 RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
index f38bec6a4a..75e3c3bd15 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/virtex4.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/powerpc/virtex5/configure.ac b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
index 096976897b..0c5481d772 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/virtex5.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
index e8c3506d8d..20759ce0dc 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
+++ b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
@@ -11,6 +11,7 @@ AC_CONFIG_SRCDIR([make/custom/riscv_generic.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac
index bf5cd49c55..71f2c2c28b 100644
--- a/c/src/lib/libbsp/sh/gensh1/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh1/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gensh1.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac
index 2d08637bac..2d6f3492fa 100644
--- a/c/src/lib/libbsp/sh/gensh2/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh2/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gensh2.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac
index 6e866aaccb..461a054033 100644
--- a/c/src/lib/libbsp/sh/gensh4/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh4/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/gensh4.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac
index 07b040e7a4..a1d3a95b7b 100644
--- a/c/src/lib/libbsp/sh/shsim/configure.ac
+++ b/c/src/lib/libbsp/sh/shsim/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/simsh1.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac
index 67aa56d71a..6e58139f95 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.ac
+++ b/c/src/lib/libbsp/sparc/erc32/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([make/custom/erc32.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc/leon2/configure.ac b/c/src/lib/libbsp/sparc/leon2/configure.ac
index 5d47b03851..cb12706219 100644
--- a/c/src/lib/libbsp/sparc/leon2/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon2/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([make/custom/leon2.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac
index e5348c6de3..c972868a8d 100644
--- a/c/src/lib/libbsp/sparc/leon3/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon3/configure.ac
@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([make/custom/leon3.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
index 7e0a060853..a22f163461 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
+++ b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([make/custom/v850e1sim.cfg])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4
index 6517598542..a4137e18de 100644
--- a/testsuites/aclocal/rtems-bsp-linkcmds.m4
+++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4
@@ -18,38 +18,8 @@ AC_MSG_CHECKING([BSP linkcmds])
 
 RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}"
 RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup"
-
-RTEMS_BSP_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/${RTEMS_BSP_FAMILY}/startup"
-
-RTEMS_BSP_LINKCMDS_SCRIPT=
-for p in "${RTEMS_BSP_LINKCMDS_PATH}" "${RTEMS_BSP_ARCH_LINKCMDS_PATH}";
-do
-  for f in "linkcmds.${RTEMS_BSP}" "linkcmds.${RTEMS_BSP_FAMILY}" "linkcmds" "linkcmds.in";
-  do
-    AS_IF([test -f "$p/$f"],[
-      RTEMS_BSP_LINKCMDS_SCRIPT="$f"
-      RTEMS_BSP_LINKCMDS_PATH="$p"
-      break])
-  done
-  AS_IF([test ! -z "$RTEMS_BSP_LINKCMDS_SCRIPT"],[break])
-done
-
-AS_IF([test -z "${RTEMS_BSP_LINKCMDS_SCRIPT}"],[
-    AC_MSG_RESULT([not found])
-    AC_MSG_ERROR([can not determine linkcmds])])
-
 RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}"
-RTEMS_BSP_LIBBSP_STARTUP_PATH="${RTEMS_BSP_LIBBSP_PATH}/startup"
-
-AS_IF([test "${RTEMS_BSP_LINKCMDS_SCRIPT}" == "linkcmds.in"],[
-    RTEMS_BSP_LINKCMDS_PATH="${RTEMS_BSP_LIBBSP_PATH}/startup"
-    RTEMS_BSP_LINKCMDS_SCRIPT=linkcmds])
-
-AC_MSG_RESULT([${RTEMS_BSP_LINKCMDS_PATH}/${RTEMS_BSP_LINKCMDS_SCRIPT}])
 
 AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH)
 AC_SUBST(RTEMS_BSP_LIBBSP_PATH)
-AC_SUBST(RTEMS_BSP_LIBBSP_STARTUP_PATH)
-AC_SUBST(RTEMS_BSP_LINKCMDS_PATH)
-AC_SUBST(RTEMS_BSP_LINKCMDS_SCRIPT)
 ])
diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am
index 190a9ccc55..3cd08c4b9e 100644
--- a/testsuites/automake/compile.am
+++ b/testsuites/automake/compile.am
@@ -12,12 +12,9 @@ STRIP = @STRIP@
 AM_CPPFLAGS = $(TEST_FLAGS) @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
 AM_CFLAGS   = $(TEST_C_FLAGS)
 AM_CXXFLAGS = $(TEST_CXX_FLAGS)
-AM_LDFLAGS  = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) -qnolinkcmds \
+AM_LDFLAGS  = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) \
               -L$(PROJECT_LIB) \
-              -L$(RTEMS_BSP_LIBBSP_STARTUP_PATH) \
               -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH) \
-              -L$(RTEMS_BSP_LINKCMDS_PATH) \
-              -Wl,-T$(RTEMS_BSP_LINKCMDS_PATH)/$(RTEMS_BSP_LINKCMDS_SCRIPT) \
               $(TEST_LD_FLAGS)
 
 CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf