From patchwork Tue Jan 7 16:51:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 22913 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46517202E0 for ; Tue, 7 Jan 2014 16:51:38 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf1569392pad.11 for ; Tue, 07 Jan 2014 08:51:37 -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=jzJn6Cm9DBhFfxSNCrJi/mvL/in4YeRZj1u1PgcwQeE=; b=d0RGjCc7M53LJU4APEI5b5BsGP4Lb7DUxEDDz3QLIRnAVKGFGtB6Gbr1wXBLeJeyIP 1Ye6JsrFdj0Y5AiU++IkNmKIKlRblF3KWc08NdHXI86t84ovSxg6XCVwu8gvoc3TLvgu B4XCzDeMbPG6zF/BdXTkcczHXkYt+kkOhDMEDKY/xqIFr6IZMEfQa4UE0HI1QaI/wLxj 03e78qvEQVpfYLHFqkrIIKDc70qOVufKkVKpVkm9jUYDx2gpIrMBqL5jh2/SDml41yAd Gx3ip2P4fx7CQIkn2d9MflGLHKbPPAGTWX/2yagsto9UkGaNpbQbBJ7NLt7eDRaDsmvW vS6Q== X-Gm-Message-State: ALoCoQn1lMzz38RodaZit++s85phnzZtqRP73WBomLA75PX9sW2l9Fj+MpEb1UiMX+Bs4vxh/Jat X-Received: by 10.68.237.37 with SMTP id uz5mr48419587pbc.0.1389113497948; Tue, 07 Jan 2014 08:51:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.41 with SMTP id 9ls201703qer.99.gmail; Tue, 07 Jan 2014 08:51:37 -0800 (PST) X-Received: by 10.52.22.40 with SMTP id a8mr2991777vdf.49.1389113497841; Tue, 07 Jan 2014 08:51:37 -0800 (PST) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id si2si12701vdc.116.2014.01.07.08.51.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 Jan 2014 08:51:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.182 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.182; Received: by mail-ve0-f182.google.com with SMTP id jy13so321263veb.41 for ; Tue, 07 Jan 2014 08:51:37 -0800 (PST) X-Received: by 10.53.8.1 with SMTP id dg1mr2931041vdd.52.1389113497480; Tue, 07 Jan 2014 08:51:37 -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.59.13.131 with SMTP id ey3csp171287ved; Tue, 7 Jan 2014 08:51:36 -0800 (PST) X-Received: by 10.152.219.133 with SMTP id po5mr3927605lac.34.1389113495999; Tue, 07 Jan 2014 08:51:35 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id 9si38690889lal.132.2014.01.07.08.51.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 07 Jan 2014 08:51:35 -0800 (PST) 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; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1W0ZsG-0004gw-MM; Tue, 07 Jan 2014 16:51:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , Claudio Fontana , kvmarm@lists.cs.columbia.edu, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Anthony Liguori , Aurelien Jarno , Blue Swirl , Stefan Weil Subject: [PATCH 1/4] rules.mak: Support .cc as a C++ source file suffix Date: Tue, 7 Jan 2014 16:51:25 +0000 Message-Id: <1389113488-18005-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389113488-18005-1-git-send-email-peter.maydell@linaro.org> References: <1389113488-18005-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.128.182 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 --- 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