From: Jan Kiszka <jan.kis...@siemens.com>
This fixes "make ARCH=i386" of the KVM micro tests on x86-64 hosts.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>
diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak
index 63cca42..f3172fb 100644
--- a/kvm/user/config-x86-common.mak
+++ b/kvm/user/config-x86-common.mak
@@ -18,6 +18,8 @@ $(libcflat): CFLAGS += -ffreestanding -I test/lib
CFLAGS += -m$(bits)
+libgcc := $(shell $(CC) -m$(bits) --print-libgcc-file-name)
+
FLATLIBS = test/lib/libcflat.a $(libgcc)
%.flat: %.o $(FLATLIBS)
$(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
@@ -32,7 +34,7 @@ test_cases: $(tests-common) $(tests)
$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I test/lib -I
test/lib/x86
$(TEST_DIR)/bootstrap: $(TEST_DIR)/bootstrap.o
- $(CC) -nostdlib -o $@ -Wl,-T,bootstrap.lds $^
+ $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,bootstrap.lds $^
$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o $(TEST_DIR)/print.o
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
