From patchwork Tue Mar 27 07:30:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Essen X-Patchwork-Id: 148873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D318B6EE7 for ; Tue, 27 Mar 2012 18:30:57 +1100 (EST) Received: from localhost ([::1]:58047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCQrm-0004Nj-UQ for incoming@patchwork.ozlabs.org; Tue, 27 Mar 2012 03:30:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCQrU-00049f-0r for qemu-devel@nongnu.org; Tue, 27 Mar 2012 03:30:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCQrM-0000mU-Fi for qemu-devel@nongnu.org; Tue, 27 Mar 2012 03:30:35 -0400 Received: from 204.146.238.178.in-addr.arpa ([178.238.146.204]:33969 helo=mail.local) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCQrM-0000ls-6g for qemu-devel@nongnu.org; Tue, 27 Mar 2012 03:30:28 -0400 Received: from soldev64.local (209.146.238.178.in-addr.arpa [178.238.146.209]) by mail.local (Postfix) with ESMTP id 1B66A408E; Tue, 27 Mar 2012 07:30:26 +0000 (UTC) From: Lee Essen To: qemu-devel@nongnu.org Date: Tue, 27 Mar 2012 07:30:25 +0000 Message-Id: <1332833425-18750-2-git-send-email-lee.essen@nowonline.co.uk> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1332833425-18750-1-git-send-email-lee.essen@nowonline.co.uk> References: <1332833425-18750-1-git-send-email-lee.essen@nowonline.co.uk> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.238.146.204 Cc: Stefan Hajnoczi , =?UTF-8?q?Andreas=20F=E4rber?= , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/2] Add support for Solaris dtrace -m32/-m64 flags X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Solaris requires a -m32/-m64 flag to determin if building for 32bit or 64bit environments. This patch add a CONFIG_DTRACE_FLAGS variable to configure and then makes use of that in the relevant Makefiles and rules.mak Signed-off-by: Lee Essen --- Makefile.objs | 2 +- configure | 8 ++++++++ rules.mak | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index a2b3fe4..c834c43 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -384,7 +384,7 @@ trace.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak trace.o: trace.c $(GENERATED_HEADERS) trace-dtrace.h: trace-dtrace.dtrace - $(call quiet-command,dtrace -o $@ -h -s $<, " GEN trace-dtrace.h") + $(call quiet-command,dtrace $(CONFIG_DTRACE_FLAGS) -o $@ -h -s $<, " GEN trace-dtrace.h") # Normal practice is to name DTrace probe file with a '.d' extension # but that gets picked up by QEMU's Makefile as an external dependency diff --git a/configure b/configure index 14ef738..107279a 100755 --- a/configure +++ b/configure @@ -3319,6 +3319,14 @@ if test "$trace_backend" = "dtrace"; then echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak if test "$trace_backend_stap" = "yes" ; then echo "CONFIG_TRACE_SYSTEMTAP=y" >> $config_host_mak + else + if test "$solaris" = "yes"; then + if test "$cpu" = "x86_64" -o "$cpu" = "sparc64"; then + echo "CONFIG_DTRACE_FLAGS=-64" >> $config_host_mak + else + echo "CONFIG_DTRACE_FLAGS=-32" >> $config_host_mak + fi + fi fi fi echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 501e5cd..0c1a6f6 100644 --- a/rules.mak +++ b/rules.mak @@ -34,9 +34,9 @@ endif LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(sort $(1)) $(LIBS)," LINK $(TARGET_DIR)$@") ifdef CONFIG_SOLARIS -DTRACE = $(call quiet-command,dtrace -o $(1) -G -s $(2) $(3), " GEN $(TARGET_DIR)$(1)") +DTRACE = $(call quiet-command,dtrace $(CONFIG_DTRACE_FLAGS) -o $(1) -G -s $(2) $(3), " GEN $(TARGET_DIR)$(1)") else -DTRACE = $(call quiet-command,dtrace -o $(1) -G -s $(2), " GEN $(TARGET_DIR)$(1)") +DTRACE = $(call quiet-command,dtrace $(CONFIG_DTRACE_FLAGS) -o $(1) -G -s $(2), " GEN $(TARGET_DIR)$(1)") endif %$(EXESUF): %.o