app-tools: Remove useless objcopy from stunt ld

Discussed with Ian previously; the objcopy step was left over from
previous attempts at namespacing mini-os and is no longer required as
this is performed when linking minios.o.

Signed-off-by: Martin Lucina <martin@lucina.net>

diff --git a/app-tools/ld b/app-tools/ld
index 056c50d58327770032159854eccf8cf1245633d7..c889f8092b0d17539fe5dbc97f4e30f2226b0e0d 100755 (executable)
--- a/app-tools/ld
+++ b/app-tools/ld
@@ -32,7 +32,6 @@ while [ $# != 0 ]; do
                ;;
        --stunt-intermediate)
                inter1="$1"; shift || noshift
-               inter2="$1"; shift || noshift
                ;;
        -plugin|-plugin-opt)
                shift || noshift
@@ -49,5 +48,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 ${march:+-m ${march}} -T "$finallds" "$inter2" -o "$outfile"
+ld ${march:+-m ${march}} -T "$finallds" "$inter1" -o "$outfile"

diff --git a/app-tools/specs.configure.in b/app-tools/specs.configure.in
index 8d2d3aba7d99e6c3de3953e1fe4464058751e163..cec70af4b74c4131c16e071bd5df70a697d52213 100644 (file)
--- a/app-tools/specs.configure.in
+++ b/app-tools/specs.configure.in
@@ -4,7 +4,7 @@
 -nostdinc -isystem !BASE!/rump/include -isystem !BASE!/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__
 
 *linker:
-!APPTOOLS!/ld --stunt-intermediate %g.link1 %g.link2 --stunt-final-script !LDSCRIPT!
+!APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT!
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386}

diff --git a/app-tools/specs.in b/app-tools/specs.in
index c80882a03afaced3610089ed99f005fc317068ff..fa304e85daac5a41552a12918e59a237fabf2071 100644 (file)
--- a/app-tools/specs.in
+++ b/app-tools/specs.in
@@ -4,7 +4,7 @@
 -nostdinc -isystem !BASE!/rump/include -isystem !BASE!/include %(old_cpp_options) !CPPFLAGS! -D__RUMPUSER_XEN__ -D__RUMPAPP__ -D__NetBSD__
 
 *linker:
-!APPTOOLS!/ld --stunt-intermediate %g.link1 %g.link2 --stunt-final-script !LDSCRIPT!
+!APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT!
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386}