[qemu-kvm tests PATCH v3] qemu-kvm tests: fix linker script problem

[qemu-kvm tests PATCH v3] qemu-kvm tests: fix linker script problem

[Naphtali Sprei]

commit 848bd0c89c83814023cf51c72effdbc7de0d18b7 causes the linker script
itself (flat.lds) to become part of the linked objects, which messed
the output file, specifically, the symbol edata is not the last symbol
anymore.

changes v2 -> v3

Instead of using a separate rule, which doesn't really adds the flat.lds to the prerequisite
list, use Avi suggestion of filtering.


Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
---
 kvm/user/config-x86-common.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak
index 61cc2f0..cf36aa1 100644
--- a/kvm/user/config-x86-common.mak
+++ b/kvm/user/config-x86-common.mak
@@ -20,7 +20,7 @@ libgcc := $(shell $(CC) -m$(bits) --print-libgcc-file-name)
 
 FLATLIBS = test/lib/libcflat.a $(libgcc)
 %.flat: %.o $(FLATLIBS) flat.lds
-	$(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
+	$(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $(filter %.o, $^) $(FLATLIBS)
 
 tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
                $(TEST_DIR)/smptest.flat  $(TEST_DIR)/port80.flat \
-- 
1.6.3.3

Re: [qemu-kvm tests PATCH v3] qemu-kvm tests: fix linker script problem

[Marcelo Tosatti]

On Wed, May 05, 2010 at 08:28:15PM +0300, Naphtali Sprei wrote:
> 
> commit 848bd0c89c83814023cf51c72effdbc7de0d18b7 causes the linker script
> itself (flat.lds) to become part of the linked objects, which messed
> the output file, specifically, the symbol edata is not the last symbol
> anymore.
> 
> changes v2 -> v3
> 
> Instead of using a separate rule, which doesn't really adds the flat.lds to the prerequisite
> list, use Avi suggestion of filtering.
> 
> Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
> ---
>  kvm/user/config-x86-common.mak |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.