From patchwork Mon Jun 6 18:41:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1761 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:35 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs53941vdc; Mon, 6 Jun 2011 11:41:04 -0700 (PDT) Received: by 10.14.50.7 with SMTP id y7mr2141301eeb.83.1307385663459; Mon, 06 Jun 2011 11:41:03 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id s51si11435914ees.74.2011.06.06.11.41.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Jun 2011 11:41:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QTejU-0006Eg-Jx; Mon, 06 Jun 2011 19:41:00 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH v2 6/6] Revert "Makefile.target: Allow target helpers to be in any *_helper.c file" Date: Mon, 6 Jun 2011 19:41:00 +0100 Message-Id: <1307385660-23935-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1307385660-23935-1-git-send-email-peter.maydell@linaro.org> References: <1307385660-23935-1-git-send-email-peter.maydell@linaro.org> Reverts commit 348883d4828d7434e1053407818598f7fb15e594, so the global env is no longer available to helper.c files other than op_helper.c. Signed-off-by: Peter Maydell --- Makefile.target | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index 8b6e271..c51874d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -93,7 +93,7 @@ tcg/tcg.o: cpu.h # HELPER_CFLAGS is used for all the code compiled with static register # variables -%_helper.o cpu-exec.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS) +op_helper.o cpu-exec.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS) # Note: this is a workaround. The real fix is to avoid compiling # cpu_signal_handler() in user-exec.c.