From: Hollis Blanchard <[EMAIL PROTECTED]>
This allows other architectures to build test executables in other ways.
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/user/Makefile b/user/Makefile
index 60f8bd8..d77eba2 100644
--- a/user/Makefile
+++ b/user/Makefile
@@ -8,6 +8,8 @@ DESTDIR :=
#make sure env CFLAGS variable is not used
CFLAGS =
+libgcc := $(shell gcc --print-libgcc-file-name)
+
#include architecure specific make rules
include config-$(ARCH).mak
@@ -29,18 +31,11 @@ CXXFLAGS = $(autodepend-flags)
autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d
-libgcc := $(shell gcc --print-libgcc-file-name)
-
-FLATLIBS = $(TEST_DIR)/libcflat.a $(libgcc)
-
kvmctl: LDFLAGS += -pthread -lrt
kvmctl: $(kvmctl_objs)
$(CC) $(LDFLAGS) $^ -o $@
-%.flat: %.o $(FLATLIBS)
- $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
-
%.o: %.S
$(CC) $(CFLAGS) -c -nostdlib -o $@ $^
diff --git a/user/config-x86-common.mak b/user/config-x86-common.mak
index 7aad8d6..8cfdd45 100644
--- a/user/config-x86-common.mak
+++ b/user/config-x86-common.mak
@@ -6,6 +6,10 @@ kvmctl_objs= main.o iotable.o ../libkvm/libkvm.a
balloon_ctl: balloon_ctl.o
+FLATLIBS = $(TEST_DIR)/libcflat.a $(libgcc)
+%.flat: %.o $(FLATLIBS)
+ $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ $(FLATLIBS)
+
tests-common = $(TEST_DIR)/bootstrap \
$(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
$(TEST_DIR)/smp.flat $(TEST_DIR)/port80.flat
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
