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

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

[Naphtali Sprei]

This is a fix to a previous patch by me.
It's on 'next' branch, as of now.

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

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..ad7aeac 100644
--- a/kvm/user/config-x86-common.mak
+++ b/kvm/user/config-x86-common.mak
@@ -19,7 +19,7 @@ CFLAGS += -m$(bits)
 libgcc := $(shell $(CC) -m$(bits) --print-libgcc-file-name)
 
 FLATLIBS = test/lib/libcflat.a $(libgcc)
-%.flat: %.o $(FLATLIBS) flat.lds
+%.flat: %.o $(FLATLIBS)
 	$(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
 
 tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
-- 
1.6.3.3

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

[Avi Kivity]

On 05/03/2010 02:34 PM, Naphtali Sprei wrote:
> This is a fix to a previous patch by me.
> It's on 'next' branch, as of now.
>
> commit 848bd0c89c83814023cf51c72effdbc7de0d18b7 causes the linker script
> itself (flat.lds) to become part of the linked objects, which messed
> the output file, one such problem is that symbol edata is not the last symbol
> anymore.
>
>
>
> diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak
> index 61cc2f0..ad7aeac 100644
> --- a/kvm/user/config-x86-common.mak
> +++ b/kvm/user/config-x86-common.mak
> @@ -19,7 +19,7 @@ CFLAGS += -m$(bits)
>   libgcc := $(shell $(CC) -m$(bits) --print-libgcc-file-name)
>
>   FLATLIBS = test/lib/libcflat.a $(libgcc)
> -%.flat: %.o $(FLATLIBS) flat.lds
> +%.flat: %.o $(FLATLIBS)
>   	$(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
>
>    

This drops the dependency, so if flat.lds changes, we don't rebuild.

I think you can replace $^ by $(filter %.o, $^) and retain the dependency.

-- 
error compiling committee.c: too many arguments to function