Moved -qnolinkcmds option so arguments passed on the command line are

interpreted at the right point per Eric Norum's discovery:

    The problem with the my previous `fix' for adding linker commands
    was with the ordering of the options to the linker.

    For example, to make a larger heap size, the application Makefile would
    CFLAGS_LD = -Wl,--defsym -Wl,HeapSize=0x40000

    The command passed to the linker would be :
    m68k-rtems-ld .... -T xxx/linkcmds .... --defsym HeapSize=0x40000 .....

    This doesn't work because the script in linkcmds inserts a default
    value for HeapSize if HeapSize is not defined by the time the linker
    looks at the linkcmds script.

    The solution seems to be to move the -T linkcmds%s in the bsp_specs
    file out of the link specfication and into the lib specification -- a
    little unorthodox, perhaps, but it seems to work!

19 files changed, 38 insertions, 38 deletions

diff --git a/c/src/lib/libbsp/i386/force386/bsp_specs b/c/src/lib/libbsp/i386/force386/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/i386/force386/bsp_specs
+++ b/c/src/lib/libbsp/i386/force386/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/i386/i386ex/bsp_specs b/c/src/lib/libbsp/i386/i386ex/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/i386/i386ex/bsp_specs
+++ b/c/src/lib/libbsp/i386/i386ex/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/i386/pc386/bsp_specs b/c/src/lib/libbsp/i386/pc386/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/i386/pc386/bsp_specs
+++ b/c/src/lib/libbsp/i386/pc386/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/i960/cvme961/bsp_specs b/c/src/lib/libbsp/i960/cvme961/bsp_specs
index 0e4b01d063..40e8c13291 100644
--- a/c/src/lib/libbsp/i960/cvme961/bsp_specs
+++ b/c/src/lib/libbsp/i960/cvme961/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/bsp_specs b/c/src/lib/libbsp/m68k/dmv152/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/m68k/dmv152/bsp_specs
+++ b/c/src/lib/libbsp/m68k/dmv152/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/efi332/bsp_specs b/c/src/lib/libbsp/m68k/efi332/bsp_specs
index 3ce47d3702..290bf0af40 100644
--- a/c/src/lib/libbsp/m68k/efi332/bsp_specs
+++ b/c/src/lib/libbsp/m68k/efi332/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start332.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/efi68k/bsp_specs b/c/src/lib/libbsp/m68k/efi68k/bsp_specs
index 8c557a0921..a01455935e 100644
--- a/c/src/lib/libbsp/m68k/efi68k/bsp_specs
+++ b/c/src/lib/libbsp/m68k/efi68k/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start68k.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/gen68302/bsp_specs b/c/src/lib/libbsp/m68k/gen68302/bsp_specs
index 757530f5e1..13e5c56dae 100644
--- a/c/src/lib/libbsp/m68k/gen68302/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68302/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start302.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/bsp_specs
index 5d59d8c3b3..241d30f5cc 100644
--- a/c/src/lib/libbsp/m68k/gen68360/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68360/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start360.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/idp/bsp_specs b/c/src/lib/libbsp/m68k/idp/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/m68k/idp/bsp_specs
+++ b/c/src/lib/libbsp/m68k/idp/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme136/bsp_specs b/c/src/lib/libbsp/m68k/mvme136/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/m68k/mvme136/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme136/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
index 4f95da2715..5e84733426 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
index 9fddabf901..adbc3bc847 100644
--- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start.o%s} 
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/m68k/ods68302/bsp_specs b/c/src/lib/libbsp/m68k/ods68302/bsp_specs
index 901f55d7fb..be234a5855 100644
--- a/c/src/lib/libbsp/m68k/ods68302/bsp_specs
+++ b/c/src/lib/libbsp/m68k/ods68302/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: start302.o%s} 
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/mips/p4000/bsp_specs b/c/src/lib/libbsp/mips/p4000/bsp_specs
index 9af9aaa96a..c5d2427716 100644
--- a/c/src/lib/libbsp/mips/p4000/bsp_specs
+++ b/c/src/lib/libbsp/mips/p4000/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: idt_csu.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/mips64orion/p4000/bsp_specs b/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
index 9af9aaa96a..c5d2427716 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
+++ b/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: idt_csu.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/bsp_specs b/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
index b6a0a20a5f..0a7a234098 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: ecrti%O%s --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: ecrti%O%s --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: }
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -u download_entry -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -u download_entry -N -e start}
 
diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/bsp_specs
index 8de5257beb..b5eba3e2f1 100644
--- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
+++ b/c/src/lib/libbsp/sparc/erc32/bsp_specs
@@ -8,11 +8,11 @@
 %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
 *lib:
-%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group}
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lrtemsall -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
 %{!qrtems: %(old_startfile)} %{qrtems: startsis.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}