From patchwork Thu Jan 16 11:13:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 23264 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C39DE20DF3 for ; Thu, 16 Jan 2014 11:13:44 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf5099883yhq.1 for ; Thu, 16 Jan 2014 03:13:44 -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=QHEsmFfG9ZyeZNIzYGMjsHA9b5VO8m7pZ45di9V8/wjKHBdGCa90BsVjqK/sYLDT11 6mRm91W8XzTMpShNODIkkVLd+KdS0LdEnBdv67OXbjDP3flsAUghzOXXVoF8o4DUjD5Q hUp/dcOJBHi7pG22cA5H5D3VM4I98Sfw9Kajy30iJ8/d9qSorGO5X0cS3yvQZyoK0dF8 SgEahY/0iX1A8drqqsEUYZMj2TP1JRgOS4Y7eF8aW+aNF0GeTBEQ9gwCXuYChRiJpvf4 9X5Mf832cEjoiXtHBpcT1p8G6dQWVhVJBIobYEzYNtTFx0RZngwGFQFXHSaP0ZGP11XJ F51w== X-Gm-Message-State: ALoCoQlJfAWhvYZ0Bjz/WHVHtXfrXPJr0KA8hladFy2Q2EvN8oV5OeDUx9R2WedrGEfW9uwcZXAa X-Received: by 10.236.26.209 with SMTP id c57mr2565684yha.45.1389870824015; Thu, 16 Jan 2014 03:13:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.11.173 with SMTP id r13ls887813qeb.12.gmail; Thu, 16 Jan 2014 03:13:43 -0800 (PST) X-Received: by 10.220.133.80 with SMTP id e16mr6161937vct.13.1389870823916; Thu, 16 Jan 2014 03:13:43 -0800 (PST) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id tj7si3210139vdc.7.2014.01.16.03.13.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 03:13:43 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id w20so890153vbb.41 for ; Thu, 16 Jan 2014 03:13:43 -0800 (PST) X-Received: by 10.220.192.198 with SMTP id dr6mr133874vcb.26.1389870823766; Thu, 16 Jan 2014 03:13:43 -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 ey3csp338774ved; Thu, 16 Jan 2014 03:13:43 -0800 (PST) X-Received: by 10.180.11.142 with SMTP id q14mr7362367wib.45.1389870821401; Thu, 16 Jan 2014 03:13:41 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id gy9si5536989wjc.56.2014.01.16.03.13.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 Jan 2014 03:13:41 -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 1W3kt9-0001BB-PT; Thu, 16 Jan 2014 11:13:31 +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 v2 1/5] rules.mak: Support .cc as a C++ source file suffix Date: Thu, 16 Jan 2014 11:13:27 +0000 Message-Id: <1389870811-4504-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389870811-4504-1-git-send-email-peter.maydell@linaro.org> References: <1389870811-4504-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.212.54 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