From patchwork Wed Feb 5 17:28:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 24219 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 69ED120675 for ; Wed, 5 Feb 2014 17:28:52 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf3758049oag.1 for ; Wed, 05 Feb 2014 09:28:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=i5QzvlQst/C8Miwv79QSxFoAoOVtIgyHht3mYTwN0oc=; b=NWF/cwmfLLvw/hyxD/7zXbHWMzKgDn27N24WBsqwah/rkP5JzzFXIDozjH/wT0GTR4 s0mqO/9yliG9T4dAFrKRecD1n+FgObVH/atsIRuZUfyaRPi3tlbTRix7eZn1CqsDCkw+ zwv8ZzN3giYeVdtzPOgnhXRLYUUfeCAHYYv9h+DSpTpquqOC14q3KDez/euX6sYknEbk hEPCgcWzAc7PoV6g3Nij4cRTt3SOUTg2L2WqRXPMqETfQ7aVcK0kcIDfjDBmCdZAPsyX rHTEYTZgrY/VXo4mihlSIX8RoHvgqQwvWErvrDc6C7UMKOg27af0srVAOrd+zktFJMyz kToQ== X-Gm-Message-State: ALoCoQlWlq3jHAr9XbwqV3IYkBk7aTCnxMLCNlgbsGjcN6YSfw4Iy3oEXgAc83NoZgPN8LonJRxy X-Received: by 10.182.66.137 with SMTP id f9mr1091721obt.3.1391621331394; Wed, 05 Feb 2014 09:28:51 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.139 with SMTP id 11ls222679qgn.84.gmail; Wed, 05 Feb 2014 09:28:51 -0800 (PST) X-Received: by 10.52.110.201 with SMTP id ic9mr1519170vdb.22.1391621331292; Wed, 05 Feb 2014 09:28:51 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id eo4si9869399vdb.17.2014.02.05.09.28.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:28:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id im17so535713vcb.33 for ; Wed, 05 Feb 2014 09:28:51 -0800 (PST) X-Received: by 10.52.106.166 with SMTP id gv6mr176365vdb.86.1391621331215; Wed, 05 Feb 2014 09:28:51 -0800 (PST) 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 u4csp67639vcz; Wed, 5 Feb 2014 09:28:50 -0800 (PST) X-Received: by 10.112.126.135 with SMTP id my7mr1778584lbb.56.1391621329119; Wed, 05 Feb 2014 09:28:49 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id 6si15400494laq.145.2014.02.05.09.28.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:28:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WB6H7-00023P-N6; Wed, 05 Feb 2014 17:28:37 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Michael Matz , Claudio Fontana , Dirk Mueller , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Will Newton , Peter Crosthwaite , Paolo Bonzini Subject: [PATCH v3 1/5] rules.mak: Support .cc as a C++ source file suffix Date: Wed, 5 Feb 2014 17:28:33 +0000 Message-Id: <1391621317-7866-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391621317-7866-1-git-send-email-peter.maydell@linaro.org> References: <1391621317-7866-1-git-send-email-peter.maydell@linaro.org> 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.220.174 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: , The A64 disassembler libvixl uses .cc as its suffix for C++ source files, so add support for it (we already support .cpp). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- rules.mak | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rules.mak b/rules.mak index 49edb9b..cd9187e 100644 --- a/rules.mak +++ b/rules.mak @@ -8,6 +8,7 @@ MAKEFLAGS += -rR %.d: %.h: %.c: +%.cc: %.cpp: %.m: %.mak: @@ -54,6 +55,9 @@ endif %.o: %.asm $(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<," AS $(TARGET_DIR)$@") +%.o: %.cc + $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CXX $(TARGET_DIR)$@") + %.o: %.cpp $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CXX $(TARGET_DIR)$@") @@ -77,7 +81,7 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ >/dev/null 2>&1 && echo OK), $2, $3) -VPATH_SUFFIXES = %.c %.h %.S %.cpp %.m %.mak %.texi %.sh %.rc +VPATH_SUFFIXES = %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) # find-in-path