From patchwork Sat Dec 12 19:10:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 40990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B72DB6F19 for ; Sun, 13 Dec 2009 06:17:02 +1100 (EST) Received: from localhost ([127.0.0.1]:48391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJXSd-00022Z-9S for incoming@patchwork.ozlabs.org; Sat, 12 Dec 2009 14:16:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJXNp-0000ND-0Q for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:12:01 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJXNk-0000Kf-9F for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:12:00 -0500 Received: from [199.232.76.173] (port=52293 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJXNk-0000Ka-2m for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:11:56 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:56857) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NJXNj-0001zZ-OY for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:11:56 -0500 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate03.web.de (Postfix) with ESMTP id 0BC6C138A5338; Sat, 12 Dec 2009 20:11:06 +0100 (CET) Received: from [84.148.98.194] (helo=localhost.localdomain) by smtp08.web.de with asmtp (WEB.DE 4.110 #314) id 1NJXMv-0005EU-01; Sat, 12 Dec 2009 20:11:05 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 12 Dec 2009 20:10:57 +0100 Message-Id: <1260645057-19819-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <1260645057-19819-3-git-send-email-andreas.faerber@web.de> References: <1260645057-19819-1-git-send-email-andreas.faerber@web.de> <1260645057-19819-2-git-send-email-andreas.faerber@web.de> <1260645057-19819-3-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/K/4YNsUz8rrSDC4ARBPlugsBAKqZ8RwdQC276 FsTqpHOvSv7tDPxWiZVSvNB38gcYHBj5sLbei2HZPC7qvAw0u0 IWErB+78Zej1xlj2SRTA== X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Palle Lyckegaard Subject: [Qemu-devel] [PATCH 3/3] Workaround --whole-archive on Solaris X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber On OpenSolaris, neither --whole-archive nor -z allextract appear to work as expected, causing runtime errors. For example: qemu: could not open disk image [...] Fix this by extracting archives and linking their object files individually. libqemu_common.a contains object files from different subdirectories, leading to name clashes, e.g., nbd.o vs. block/nbd.o. Archive a renamed copy of the affected files instead, this avoids duplicating %.c -> %.o compilation rules. Two dashes are used for the copy to avoid name clashes between, e.g., block-qcow.c and block/qcow.c. Contain this behavior to Solaris to avoid speed regressions on Linux. Signed-off-by: Andreas Färber Cc: Palle Lyckegaard Cc: Ben Taylor --- Makefile | 14 ++++++++++++++ rules.mak | 4 ++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index a662d96..cb57c61 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,14 @@ block-nested-$(CONFIG_WIN32) += raw-win32.o block-nested-$(CONFIG_POSIX) += raw-posix.o block-nested-$(CONFIG_CURL) += curl.o +ifneq ($(CONFIG_SOLARIS),y) block-obj-y += $(addprefix block/, $(block-nested-y)) +else +block-obj-y += $(addprefix block--, $(block-nested-y)) + +block--%.o: block/%.o + $(call quiet-command,cp $< $@," CP $(TARGET_DIR)$@") +endif net-obj-y = net.o net-nested-y = queue.o checksum.o util.o @@ -116,7 +123,14 @@ net-nested-$(CONFIG_SOLARIS) += tap-solaris.o net-nested-$(CONFIG_AIX) += tap-aix.o net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o +ifneq ($(CONFIG_SOLARIS),y) net-obj-y += $(addprefix net/, $(net-nested-y)) +else +net-obj-y += $(addprefix net--, $(net-nested-y)) + +net--%.o: net/%.o + $(call quiet-command,cp $< $@," CP $(TARGET_DIR)$@") +endif ###################################################################### # libqemu_common.a: Target independent part of system emulation. The diff --git a/rules.mak b/rules.mak index 5d9f684..d0e3a2d 100644 --- a/rules.mak +++ b/rules.mak @@ -23,7 +23,11 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ %.o: %.m $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") +ifeq ($(CONFIG_SOLARIS),y) +LINK = $(call quiet-command,{ rm -rf .tmpobjs;mkdir .tmpobjs$(foreach arlib,$(ARLIBS),;(mkdir .tmpobjs/$(notdir $(arlib));cd .tmpobjs/$(notdir $(arlib)) && ar x ../../$(arlib)));$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(foreach arlib,$(ARLIBS),$(foreach obj,$(shell $(AR) t $(arlib)),.tmpobjs/$(notdir $(arlib))/$(obj))) $(LIBS);}," LINK $(TARGET_DIR)$@") +else LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(ARLIBS_BEGIN) $(ARLIBS) $(ARLIBS_END) $(LIBS)," LINK $(TARGET_DIR)$@") +endif %$(EXESUF): %.o $(call LINK,$^)