Changeset 8fe6d358 in rtems for c

Timestamp:

12/20/97 16:59:11 (26 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

bfa613b

Parents:

1587af6

Message:

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!

Location:

c/src/lib/libbsp

Files:

• i386/force386/bsp_specs (modified) (2 diffs)
• i386/i386ex/bsp_specs (modified) (2 diffs)
• i386/pc386/bsp_specs (modified) (2 diffs)
• i960/cvme961/bsp_specs (modified) (2 diffs)
• m68k/dmv152/bsp_specs (modified) (2 diffs)
• m68k/efi332/bsp_specs (modified) (2 diffs)
• m68k/efi68k/bsp_specs (modified) (2 diffs)
• m68k/gen68302/bsp_specs (modified) (2 diffs)
• m68k/gen68360/bsp_specs (modified) (2 diffs)
• m68k/idp/bsp_specs (modified) (2 diffs)
• m68k/mvme136/bsp_specs (modified) (2 diffs)
• m68k/mvme147/bsp_specs (modified) (2 diffs)
• m68k/mvme147s/bsp_specs (modified) (2 diffs)
• m68k/mvme162/bsp_specs (modified) (2 diffs)
• m68k/ods68302/bsp_specs (modified) (2 diffs)
• mips/p4000/bsp_specs (modified) (2 diffs)
• mips64orion/p4000/bsp_specs (modified) (2 diffs)
• powerpc/papyrus/bsp_specs (modified) (2 diffs)
• sparc/erc32/bsp_specs (modified) (2 diffs)

c/src/lib/libbsp/i386/force386/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/i386/i386ex/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/i386/pc386/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/i960/cvme961/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
 

c/src/lib/libbsp/m68k/dmv152/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/efi332/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/efi68k/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/gen68302/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/gen68360/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/idp/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/mvme136/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/mvme147/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/mvme147s/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/mvme162/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/m68k/ods68302/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/mips/p4000/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/mips64orion/p4000/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}
 

c/src/lib/libbsp/powerpc/papyrus/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *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}
 

c/src/lib/libbsp/sparc/erc32/bsp_specs

@@ -9 +9 @@
 
 *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:
@@ -15 +15 @@
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start %{!qnolinkcmds: -T linkcmds%s}}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}