From: Martin Lucina <martin@lucina.net>
Date: Wed, 3 Dec 2014 16:25:01 +0000 (+0100)
Subject: app-tools: Remove useless objcopy from stunt ld
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=66b09d00078908e61d0f0c1b87fc140ed8c91e06;p=rumpuser-xen.git

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 056c50d..c889f80 100755
--- 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 8d2d3ab..cec70af 100644
--- 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 c80882a..fa304e8 100644
--- 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}