do not default to 32bit build

diff --git a/app-tools/ld b/app-tools/ld
index 322dd67ed3b1bd6f67308d4877c535acf53ca467..c4f97dd7c0923956658467f439f62aa23f870cce 100755 (executable)
--- a/app-tools/ld
+++ b/app-tools/ld
@@ -8,6 +8,7 @@ noshift () { fail "no arg for $a"; }
 
 echo "stunt ld: $*"
 
+unset march
 while [ $# != 0 ]; do
        a=$1; shift
        case "$a" in
@@ -41,4 +42,4 @@ if [ x"$outfile" = x ]; then outfile=a.out; fi
 set -x
 ld -nostdlib -r "${outargs[@]}" -o "$inter1"
 objcopy -w -G xenos_* -G _start "$inter1" "$inter2"
-ld -m "$march" -T "$finallds" "$inter2" -o "$outfile"
+ld ${march:+-m ${march}} -T "$finallds" "$inter2" -o "$outfile"

diff --git a/app-tools/specs.in b/app-tools/specs.in
index 99309e879e01d890e832b29ac3cd86c25b936fa2..32c023ecee27b19e2a13043804a45a6e467e4f04 100644 (file)
--- a/app-tools/specs.in
+++ b/app-tools/specs.in
@@ -7,7 +7,7 @@
 !APPTOOLS!/ld --stunt-intermediate %g.link1 %g.link2 --stunt-final-script !LDSCRIPT!
 
 *link:
-%{m64:-m elf_x86_64} %{m64|mx32:;:-m elf_i386} %{mx32:-m elf32_x86_64}
+%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386}
 
 *endfile:
 !OBJS!