aboutsummaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-11-16 18:35:27 +0100
committerBlue Swirl <blauwirbel@gmail.com>2012-11-18 19:19:23 +0000
commit3bc2f570ec9fc930619a8ef26a22dd6d03c25dac (patch)
treeec92ca7ecc6b9da1c5c8f18e52e6498e42908f50 /Makefile.target
parent2c5c4451e69a69c0fad3303c25cc7eaad6950f79 (diff)
downloadqemu-3bc2f570ec9fc930619a8ef26a22dd6d03c25dac.zip
qemu-3bc2f570ec9fc930619a8ef26a22dd6d03c25dac.tar.gz
qemu-3bc2f570ec9fc930619a8ef26a22dd6d03c25dac.tar.bz2
build: replace weak symbols with a static library
Weak symbols were a nice idea, but they turned out not to be a good one. Toolchain support is just too sparse, in particular llvm-gcc is totally broken. This patch uses a surprisingly low-tech approach: a static library. Symbols in a static library are always overridden by symbols in an object file. Furthermore, if you place each function in a separate source file, object files for unused functions will not be taken in. This means that each function can use all the dependencies that it needs (especially QAPI stuff such as error_setg). Thus, all stubs are placed in separate object files and put together in a static library. The library then is linked to all programs. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Tested-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Tested-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index 3822bc5..8b658c0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,12 +162,12 @@ endif #CONFIG_LINUX_USER
ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable.
-$(QEMU_PROGW): $(all-obj-y)
+$(QEMU_PROGW): $(all-obj-y) ../libqemustub.a
$(call LINK,$^)
$(QEMU_PROG): $(QEMU_PROGW)
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)")
else
-$(QEMU_PROG): $(all-obj-y)
+$(QEMU_PROG): $(all-obj-y) ../libqemustub.a
$(call LINK,$^)
endif