Switched to new style which does not require hackspecs.awk.

20 files changed, 260 insertions, 580 deletions

diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/bsp_specs b/c/src/lib/libbsp/hppa1.1/simhppa/bsp_specs
index 827767f3d6..d92d3fe95e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/bsp_specs
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 
diff --git a/c/src/lib/libbsp/i386/force386/bsp_specs b/c/src/lib/libbsp/i386/force386/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/i386/force386/bsp_specs
+++ b/c/src/lib/libbsp/i386/force386/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/i386/go32/bsp_specs b/c/src/lib/libbsp/i386/go32/bsp_specs
index 3a0cb4c93a..dccc6801ef 100644
--- a/c/src/lib/libbsp/i386/go32/bsp_specs
+++ b/c/src/lib/libbsp/i386/go32/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: crt0.o%s
-{!pg:
-g: crt0.o%s
-{!g:
-p: crt0.o%s
-!p: crt0.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -) -lcgo32 -lpc
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group -lcgo32 -lpc}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: crt0.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: %(old_link)}
 
diff --git a/c/src/lib/libbsp/i386/i386ex/bsp_specs b/c/src/lib/libbsp/i386/i386ex/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/i386/i386ex/bsp_specs
+++ b/c/src/lib/libbsp/i386/i386ex/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/i960/cvme961/bsp_specs b/c/src/lib/libbsp/i960/cvme961/bsp_specs
index 866b9aeb8f..8373c99db1 100644
--- a/c/src/lib/libbsp/i960/cvme961/bsp_specs
+++ b/c/src/lib/libbsp/i960/cvme961/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e _start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e _start}
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/bsp_specs b/c/src/lib/libbsp/m68k/dmv152/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/m68k/dmv152/bsp_specs
+++ b/c/src/lib/libbsp/m68k/dmv152/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/efi332/bsp_specs b/c/src/lib/libbsp/m68k/efi332/bsp_specs
index 5ba97705d5..fd0a4e11eb 100644
--- a/c/src/lib/libbsp/m68k/efi332/bsp_specs
+++ b/c/src/lib/libbsp/m68k/efi332/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start332.o%s
-{!pg:
-g: start332.o%s
-{!g:
-p: start332.o%s
-!p: start332.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start332.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/efi68k/bsp_specs b/c/src/lib/libbsp/m68k/efi68k/bsp_specs
index 8ca61fbb24..6173abc44e 100644
--- a/c/src/lib/libbsp/m68k/efi68k/bsp_specs
+++ b/c/src/lib/libbsp/m68k/efi68k/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start68k.o%s
-{!pg:
-g: start68k.o%s
-{!g:
-p: start68k.o%s
-!p: start68k.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start68k.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/gen68302/bsp_specs b/c/src/lib/libbsp/m68k/gen68302/bsp_specs
index 5bcccba7af..2ef758458e 100644
--- a/c/src/lib/libbsp/m68k/gen68302/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68302/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start302.o%s
-{!pg:
-g: start302.o%s
-{!g:
-p: start302.o%s
-!p: start302.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start302.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/bsp_specs
index d5abc9edac..6b6bde163c 100644
--- a/c/src/lib/libbsp/m68k/gen68360/bsp_specs
+++ b/c/src/lib/libbsp/m68k/gen68360/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start360.o%s
-{!pg:
-g: start360.o%s
-{!g:
-p: start360.o%s
-!p: start360.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start360.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/idp/bsp_specs b/c/src/lib/libbsp/m68k/idp/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/m68k/idp/bsp_specs
+++ b/c/src/lib/libbsp/m68k/idp/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme136/bsp_specs b/c/src/lib/libbsp/m68k/mvme136/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/m68k/mvme136/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme136/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
index 70d6a7ab66..e2a0bd3dd6 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
index 70d6a7ab66..666bdf3690 100644
--- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme162/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start.o%s
-{!pg:
-g: start.o%s
-{!g:
-p: start.o%s
-!p: start.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start.o%s} 
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/m68k/ods68302/bsp_specs b/c/src/lib/libbsp/m68k/ods68302/bsp_specs
index 5bcccba7af..426b0990a1 100644
--- a/c/src/lib/libbsp/m68k/ods68302/bsp_specs
+++ b/c/src/lib/libbsp/m68k/ods68302/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: start302.o%s
-{!pg:
-g: start302.o%s
-{!g:
-p: start302.o%s
-!p: start302.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: start302.o%s} 
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/mips/p4000/bsp_specs b/c/src/lib/libbsp/mips/p4000/bsp_specs
index 7d3a7361f5..4cb2e44254 100644
--- a/c/src/lib/libbsp/mips/p4000/bsp_specs
+++ b/c/src/lib/libbsp/mips/p4000/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: idt_csu.o%s
-{!pg:
-g: idt_csu.o%s
-{!g:
-p: idt_csu.o%s
-!p: idt_csu.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: idt_csu.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/mips64orion/p4000/bsp_specs b/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
index 7d3a7361f5..4cb2e44254 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
+++ b/c/src/lib/libbsp/mips64orion/p4000/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: idt_csu.o%s
-{!pg:
-g: idt_csu.o%s
-{!g:
-p: idt_csu.o%s
-!p: idt_csu.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: idt_csu.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/bsp_specs b/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
index c70f7a3e9e..c67cf7ef47 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/papyrus/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: 
-{!pg:
-g: 
-{!g:
-p: 
-!p: 
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -u __vectors -u download_entry -N -T linkcmds%s 
-
-lib: replace
-mrtems: ecrti%O%s -( -lc -lrtemsall -lgcc -) 
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: ecrti%O%s --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: }
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -u download_entry -N -T linkcmds%s}
 
diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/bsp_specs
index eaf71059ad..5d40660e32 100644
--- a/c/src/lib/libbsp/sparc/erc32/bsp_specs
+++ b/c/src/lib/libbsp/sparc/erc32/bsp_specs
@@ -1,34 +1,18 @@
+%rename cpp old_cpp
+%rename lib old_lib
+%rename endfile old_endfile
+%rename startfile old_startfile
+%rename link old_link
 
-predefines:
--D__embedded__ -Asystem(embedded)
+*cpp:
+%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)
 
-startfile: replace
-mrtems:
-pg: startsis.o%s
-{!pg:
-g: startsis.o%s
-{!g:
-p: startsis.o%s
-!p: startsis.o%s
-}}
-{!mrtems:
-pg: pgcrt0%O
-{!pg:
-g: gcrt0%O
-{!g:
-p: pcrt0%O
-!p: crt0%O
-}}}
-
-
-link: replace
-mrtems: -dc -dp -N -T linkcmds%s -e start
-
-lib: replace
-mrtems: -( -lc -lrtemsall -lgcc -)
-
-
-libgcc: replace
+*lib:
+%{!qrtems: %(old_lib)} %{qrtems: --start-group -lc -lrtemsall -lgcc --end-group}
 
+*startfile:
+%{!qrtems: %(old_startfile)} %{qrtems: startsis.o%s}
 
+*link:
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -T linkcmds%s -e start}