From patchwork Thu Jun 24 07:14:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 56761 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 B87B1B6F16 for ; Thu, 24 Jun 2010 17:20:20 +1000 (EST) Received: from localhost ([127.0.0.1]:38441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORgjP-0000Ib-GX for incoming@patchwork.ozlabs.org; Thu, 24 Jun 2010 03:20:15 -0400 Received: from [140.186.70.92] (port=51601 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORghx-0008Hh-69 for qemu-devel@nongnu.org; Thu, 24 Jun 2010 03:18:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORghu-0007Z3-9v for qemu-devel@nongnu.org; Thu, 24 Jun 2010 03:18:44 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:53628) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORght-0007Xq-O6 for qemu-devel@nongnu.org; Thu, 24 Jun 2010 03:18:42 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 4275E107551; Thu, 24 Jun 2010 16:18:38 +0900 (JST) Received: (nullmailer pid 3695 invoked by uid 1000); Thu, 24 Jun 2010 07:14:52 -0000 Date: Thu, 24 Jun 2010 16:14:52 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH] poison TARGET_ for compile once. Message-ID: <20100624071452.GB4498@valinux.co.jp> References: <20100624065253.GA4498@valinux.co.jp> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100624065253.GA4498@valinux.co.jp> User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: amit.shah@redhat.com, pbonzini@redhat.com, blauwirbel@gmail.com 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 Sorry, I sent out the old patch. Here is the right one. Subject: [PATCH] poison TARGET_arch for compile once. poison TARGET_arch for compile once object to prevent those ifdef from creeping in again. Signed-off-by: Isaku Yamahata --- Makefile | 6 +++--- Makefile.objs | 11 ++++++++++- Makefile.target | 4 ++-- poison-arch.h | 25 +++++++++++++++++++++++++ poison.h | 16 +--------------- 5 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 poison-arch.h diff --git a/Makefile b/Makefile index 221fbd8..6a55b86 100644 --- a/Makefile +++ b/Makefile @@ -137,11 +137,11 @@ iov.o: iov.c iov.h qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) -qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o qemu-malloc.o $(block-obj-y) $(qobject-obj-y) -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o qemu-malloc.o $(block-obj-y) $(qobject-obj-y) -qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y) +qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o qemu-malloc.o $(block-obj-y) $(qobject-obj-y) qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") diff --git a/Makefile.objs b/Makefile.objs index 53fb68e..5674922 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -7,7 +7,7 @@ qobject-obj-y += qerror.o ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img -block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o +block-obj-y = cutils.o cache-utils.o qemu-option.o module.o block-obj-y += nbd.o block.o aio.o aes.o osdep.o qemu-config.o block-obj-$(CONFIG_POSIX) += posix-aio-compat.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o @@ -265,3 +265,12 @@ os-win32.o: qemu-options.def qemu-options.def: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") + +###################################################################### +# poison TARGET_arch to prevent from creeping those defines again. + +POISON_CFLAGS = -include poison-arch.h +$(qobject-obj-y) $(block-obj-y) $(block-nested-y) $(block-obj-y) \ +$(net-obj-y) $(net-nested-y) $(fsdev-nested-y) $(fsdev-obj-y) \ +$(common-obj-y) $(audio-obj-y) $(slirp-obj-y) $(user-obj-y) \ +$(hw-obj-y) $(sound-obj-y) $(libdis-y) vl.o: QEMU_CFLAGS += $(POISON_CFLAGS) diff --git a/Makefile.target b/Makefile.target index f64702b..3475ce5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -85,8 +85,7 @@ $(call set-vpath, $(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \ - elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \ - qemu-malloc.o + elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o obj-$(TARGET_HAS_BFLT) += flatload.o @@ -302,6 +301,7 @@ obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y)) endif # CONFIG_SOFTMMU +obj-y += qemu-malloc.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) diff --git a/poison-arch.h b/poison-arch.h new file mode 100644 index 0000000..8143c41 --- /dev/null +++ b/poison-arch.h @@ -0,0 +1,25 @@ +/* Poison identifiers that should not be used when building + target independent device code. */ + +#ifndef HW_POISON_ARCH_H +#define HW_POISON_ARCH_H +#ifdef __GNUC__ + +#pragma GCC poison TARGET_I386 +#pragma GCC poison TARGET_X86_64 +#pragma GCC poison TARGET_ALPHA +#pragma GCC poison TARGET_ARM +#pragma GCC poison TARGET_CRIS +#pragma GCC poison TARGET_M68K +#pragma GCC poison TARGET_MIPS +#pragma GCC poison TARGET_MIPS64 +#pragma GCC poison TARGET_PPC +#pragma GCC poison TARGET_PPCEMB +#pragma GCC poison TARGET_PPC64 +#pragma GCC poison TARGET_ABI32 +#pragma GCC poison TARGET_SH4 +#pragma GCC poison TARGET_SPARC +#pragma GCC poison TARGET_SPARC64 + +#endif +#endif diff --git a/poison.h b/poison.h index d7db7f4..f9efae9 100644 --- a/poison.h +++ b/poison.h @@ -5,21 +5,7 @@ #define HW_POISON_H #ifdef __GNUC__ -#pragma GCC poison TARGET_I386 -#pragma GCC poison TARGET_X86_64 -#pragma GCC poison TARGET_ALPHA -#pragma GCC poison TARGET_ARM -#pragma GCC poison TARGET_CRIS -#pragma GCC poison TARGET_M68K -#pragma GCC poison TARGET_MIPS -#pragma GCC poison TARGET_MIPS64 -#pragma GCC poison TARGET_PPC -#pragma GCC poison TARGET_PPCEMB -#pragma GCC poison TARGET_PPC64 -#pragma GCC poison TARGET_ABI32 -#pragma GCC poison TARGET_SH4 -#pragma GCC poison TARGET_SPARC -#pragma GCC poison TARGET_SPARC64 +#include "poison-arch.h" #pragma GCC poison TARGET_WORDS_BIGENDIAN #pragma GCC poison BSWAP_NEEDED