From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935179AbcJFWpS (ORCPT ); Thu, 6 Oct 2016 18:45:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46612 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935840AbcJFWpD (ORCPT ); Thu, 6 Oct 2016 18:45:03 -0400 Date: Thu, 6 Oct 2016 15:44:51 -0700 From: tip-bot for Wang Nan Message-ID: Cc: jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, ast@fb.com, lizefan@huawei.com, wangnan0@huawei.com, mingo@kernel.org, hekuang@huawei.com, hpa@zytor.com, acme@redhat.com Reply-To: hpa@zytor.com, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, hekuang@huawei.com, jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, ast@fb.com, lizefan@huawei.com In-Reply-To: <1474874832-134786-2-git-send-email-wangnan0@huawei.com> References: <1474874832-134786-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools build: Support compiling C++ source file Git-Commit-ID: f61bdc3304281e9ff9eec4f1ed9fb15bcf4d8a5e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f61bdc3304281e9ff9eec4f1ed9fb15bcf4d8a5e Gitweb: http://git.kernel.org/tip/f61bdc3304281e9ff9eec4f1ed9fb15bcf4d8a5e Author: Wang Nan AuthorDate: Mon, 26 Sep 2016 07:26:55 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Oct 2016 19:58:51 -0300 tools build: Support compiling C++ source file Add new rule to compile .cpp file to .o use g++. C++ support is required for built-in clang and LLVM support. Linker side support will be introduced by following commits. Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1474874832-134786-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Build.include | 1 + tools/build/Makefile.build | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/tools/build/Build.include b/tools/build/Build.include index 0248938..1dcb95e 100644 --- a/tools/build/Build.include +++ b/tools/build/Build.include @@ -90,6 +90,7 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ # - per object C flags # - BUILD_STR macro to allow '-D"$(variable)"' constructs c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS) -D"BUILD_STR(s)=\#s" $(CFLAGS_$(basetarget).o) $(CFLAGS_$(obj)) +cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj)) ### ## HOSTCC C flags diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 190519a..99c0ccd 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -61,6 +61,9 @@ quiet_cmd_cc_o_c = CC $@ quiet_cmd_host_cc_o_c = HOSTCC $@ cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $< +quiet_cmd_cxx_o_c = CXX $@ + cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $< + quiet_cmd_cpp_i_c = CPP $@ cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $< @@ -88,6 +91,10 @@ $(OUTPUT)%.o: %.c FORCE $(call rule_mkdir) $(call if_changed_dep,$(host)cc_o_c) +$(OUTPUT)%.o: %.cpp FORCE + $(call rule_mkdir) + $(call if_changed_dep,cxx_o_c) + $(OUTPUT)%.o: %.S FORCE $(call rule_mkdir) $(call if_changed_dep,$(host)cc_o_c)