From patchwork Fri Sep 13 14:19:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 20285 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A745F202E6 for ; Fri, 13 Sep 2013 15:23:42 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id u18sf1406797qcx.2 for ; Fri, 13 Sep 2013 08:23:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=GfiUboFB6DQ/iNk9D5g7Srp4DikWJ2bKxdxaV8DO/P0=; b=W0PeDEz/cAitBqZ1CKSCUXcwgLvxFDdxJcMENku2FZASdWWoRVl+VT0KYZlGlJK4/q fQP48r2SD+s+Q3j+PZ7VC7ibypE9sJuEIBq+7RqZFjMTQIpNPVfKuXNLWTm8moTt40F6 h8lqK0ghGEAAVdm04aUY+ihapwEHhCwpInuycZUEqPi2ytNDZghhZAWeSm/VLuihdSGO yDmN7YsCh7Ck2x6mZM13yox+PREZjXf3Om3CHU+RQAFUnFG/WvhEV2JqyTcOaSI4hLss 8V/+ikGth8RItFZvoSMFrhbP3v6YwGsk60MjZ+Ce7abpFkSpCVhhPHFw5At1qI/ILAoQ UrsA== X-Gm-Message-State: ALoCoQl2eng/YyO+ga6BGULleRpUGcE14tSDA0KTXdDZ5ZFb4Gi+89imhlQpzEEgJUAdbFeneM+K X-Received: by 10.52.162.233 with SMTP id yd9mr114425vdb.6.1379081986592; Fri, 13 Sep 2013 07:19:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.83 with SMTP id s19ls1193997qeu.7.gmail; Fri, 13 Sep 2013 07:19:46 -0700 (PDT) X-Received: by 10.220.173.134 with SMTP id p6mr286478vcz.36.1379081986387; Fri, 13 Sep 2013 07:19:46 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id ed9si3195001vcb.81.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 07:19:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id cz12so1028460veb.32 for ; Fri, 13 Sep 2013 07:19:46 -0700 (PDT) X-Received: by 10.58.76.199 with SMTP id m7mr294976vew.35.1379081986283; Fri, 13 Sep 2013 07:19:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp83198vcz; Fri, 13 Sep 2013 07:19:45 -0700 (PDT) X-Received: by 10.180.206.5 with SMTP id lk5mr2874575wic.10.1379081982700; Fri, 13 Sep 2013 07:19:42 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id h7si5540754wja.53.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 07:19:42 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VKUDj-0002v1-It; Fri, 13 Sep 2013 15:19:39 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?=C3=81kos=20Kov=C3=A1cs?= , Anthony Liguori , Paolo Bonzini Subject: [PATCH 2/3] Makefile.target: CONFIG_NO_* variables removed Date: Fri, 13 Sep 2013 15:19:38 +0100 Message-Id: <1379081979-11186-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379081979-11186-1-git-send-email-peter.maydell@linaro.org> References: <1379081979-11186-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Ákos Kovács CONFIG_NO_* variables replaced with the lnot logical function Signed-off-by: Ákos Kovács [PMM: fixed a few CONFIG_NO_* uses that were missed] Signed-off-by: Peter Maydell --- Makefile.target | 8 ++------ hw/pci/Makefile.objs | 2 +- target-arm/Makefile.objs | 2 +- target-i386/Makefile.objs | 2 +- target-ppc/Makefile.objs | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile.target b/Makefile.target index 9a49852..bbc668b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -70,10 +70,6 @@ all: $(PROGS) stap # Dummy command so that make thinks it has done something @true -CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) -CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) -CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) - ######################################################### # cpu emulator library obj-y = exec.o translate-all.o cpu-exec.o @@ -84,7 +80,7 @@ obj-y += fpu/softfloat.o obj-y += target-$(TARGET_BASE_ARCH)/ obj-y += disas.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o ######################################################### # Linux user emulator target @@ -125,7 +121,7 @@ LIBS+=$(libs_softmmu) # xen support obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o -obj-$(CONFIG_NO_XEN) += xen-stub.o +obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 720f438..80f8aa6 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -5,7 +5,7 @@ common-obj-$(CONFIG_PCI) += slotid_cap.o common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o -common-obj-$(CONFIG_NO_PCI) += pci-stub.o +common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o common-obj-$(CONFIG_ALL) += pci-stub.o common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o diff --git a/target-arm/Makefile.objs b/target-arm/Makefile.objs index 6453f5c..356fbfc 100644 --- a/target-arm/Makefile.objs +++ b/target-arm/Makefile.objs @@ -1,7 +1,7 @@ obj-y += arm-semi.o obj-$(CONFIG_SOFTMMU) += machine.o obj-$(CONFIG_KVM) += kvm.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-y += translate.o op_helper.o helper.o cpu.o obj-y += neon_helper.o iwmmxt_helper.o obj-y += gdbstub.o diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs index da1fc40..027b94e 100644 --- a/target-i386/Makefile.objs +++ b/target-i386/Makefile.objs @@ -4,6 +4,6 @@ obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o obj-y += gdbstub.o obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o obj-$(CONFIG_KVM) += kvm.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-$(CONFIG_LINUX_USER) += ioport-user.o obj-$(CONFIG_BSD_USER) += ioport-user.o diff --git a/target-ppc/Makefile.objs b/target-ppc/Makefile.objs index f72e399..94d6d0c 100644 --- a/target-ppc/Makefile.objs +++ b/target-ppc/Makefile.objs @@ -5,7 +5,7 @@ obj-y += machine.o mmu_helper.o mmu-hash32.o obj-$(TARGET_PPC64) += mmu-hash64.o endif obj-$(CONFIG_KVM) += kvm.o kvm_ppc.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-y += excp_helper.o obj-y += fpu_helper.o obj-y += int_helper.o