From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <alexei.starovoitov@gmail.com>
Cc: <lizefan@huawei.com>, <linux-kernel@vger.kernel.org>,
<pi3orama@163.com>, Wang Nan <wangnan0@huawei.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Alexei Starovoitov <ast@plumgrid.com>,
He Kuang <hekuang@huawei.com>, "Jiri Olsa" <jolsa@kernel.org>
Subject: [PATCH v2 02/18] perf tools: Add feature detection for g++
Date: Mon, 26 Sep 2016 07:26:56 +0000 [thread overview]
Message-ID: <1474874832-134786-3-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1474874832-134786-1-git-send-email-wangnan0@huawei.com>
Check if g++ is available. The result will be used by builtin clang and
LLVM support. Since LLVM requires C++11, this feature detector checks
std::move().
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
---
tools/build/Makefile.feature | 2 +-
tools/build/feature/Makefile | 10 +++++++++-
tools/build/feature/test-cxx.cpp | 15 +++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 tools/build/feature/test-cxx.cpp
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index a120c6b..ae52e02 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -7,7 +7,7 @@ endif
feature_check = $(eval $(feature_check_code))
define feature_check_code
- feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)
+ feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)
endef
feature_set = $(eval $(feature_set_code))
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index a0b29a3..ac9c477 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -46,11 +46,13 @@ FILES= \
test-lzma.bin \
test-bpf.bin \
test-get_cpuid.bin \
- test-sdt.bin
+ test-sdt.bin \
+ test-cxx.bin
FILES := $(addprefix $(OUTPUT),$(FILES))
CC := $(CROSS_COMPILE)gcc -MD
+CXX := $(CROSS_COMPILE)g++ -MD
PKG_CONFIG := $(CROSS_COMPILE)pkg-config
all: $(FILES)
@@ -58,6 +60,9 @@ all: $(FILES)
__BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.c,$(@F)) $(LDFLAGS)
BUILD = $(__BUILD) > $(@:.bin=.make.output) 2>&1
+__BUILDXX = $(CXX) $(CXXFLAGS) -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$(@F)) $(LDFLAGS)
+ BUILDXX = $(__BUILDXX) > $(@:.bin=.make.output) 2>&1
+
###############################
$(OUTPUT)test-all.bin:
@@ -217,6 +222,9 @@ $(OUTPUT)test-bpf.bin:
$(OUTPUT)test-sdt.bin:
$(BUILD)
+$(OUTPUT)test-cxx.bin:
+ $(BUILDXX) -std=gnu++11
+
-include $(OUTPUT)*.d
###############################
diff --git a/tools/build/feature/test-cxx.cpp b/tools/build/feature/test-cxx.cpp
new file mode 100644
index 0000000..b1dee9a
--- /dev/null
+++ b/tools/build/feature/test-cxx.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+#include <memory>
+
+static void print_str(std::string s)
+{
+ std::cout << s << std::endl;
+}
+
+int main()
+{
+ std::string s("Hello World!");
+ print_str(std::move(s));
+ std::cout << "|" << s << "|" << std::endl;
+ return 0;
+}
--
1.8.3.4
next prev parent reply other threads:[~2016-09-26 7:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 7:26 [PATCH v2 00/18] perf clang: Support compiling BPF script on the fly Wang Nan
2016-09-26 7:26 ` [PATCH v2 01/18] tools build: Support compiling C++ source file Wang Nan
2016-10-06 22:44 ` [tip:perf/urgent] " tip-bot for Wang Nan
2016-09-26 7:26 ` Wang Nan [this message]
2016-10-06 22:45 ` [tip:perf/urgent] tools build: Add feature detection for g++ tip-bot for Wang Nan
2016-09-26 7:26 ` [PATCH v2 03/18] perf tools: Add feature detection for LLVM Wang Nan
2016-09-26 7:26 ` [PATCH v2 04/18] perf tools: Add feature detection for clang Wang Nan
2016-09-26 7:26 ` [PATCH v2 05/18] perf build: Add clang and llvm compile and linking support Wang Nan
2016-09-26 7:27 ` [PATCH v2 06/18] perf clang: Add builtin clang support ant test case Wang Nan
2016-09-26 7:27 ` [PATCH v2 07/18] perf clang: Use real file system for #include Wang Nan
2016-09-26 7:27 ` [PATCH v2 08/18] perf clang: Allow passing CFLAGS to builtin clang Wang Nan
2016-09-26 7:27 ` [PATCH v2 09/18] perf clang: Update test case to use real BPF script Wang Nan
2016-09-26 7:27 ` [PATCH v2 10/18] perf clang: Support compile IR to BPF object and add testcase Wang Nan
2016-09-26 7:27 ` [PATCH v2 11/18] perf tools: Extract helpers in llvm-utils.c Wang Nan
2016-09-26 7:27 ` [PATCH v2 12/18] perf bpf: Compile BPF script use builtin clang support Wang Nan
2016-09-26 7:27 ` [PATCH v2 13/18] perf clang: Pass full path to builtin clang Wang Nan
2016-09-26 7:27 ` [PATCH v2 14/18] perf clang: Pass CFLAGS " Wang Nan
2016-09-26 7:27 ` [PATCH v2 15/18] perf clang: Link BPF functions declaration into perf Wang Nan
2016-09-26 7:27 ` [PATCH v2 16/18] perf clang: Declare BPF functions for BPF scripts automatically Wang Nan
2016-09-26 7:27 ` [PATCH v2 17/18] perf clang: Include helpers to BPF scripts Wang Nan
2016-09-26 7:27 ` [PATCH v2 18/18] perf clang: Define PERF_BUILTIN_CLANG for builtin clang compiling Wang Nan
2016-10-05 23:20 ` [PATCH v2 00/18] perf clang: Support compiling BPF script on the fly Arnaldo Carvalho de Melo
2016-10-08 2:03 ` Wangnan (F)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474874832-134786-3-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@plumgrid.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=pi3orama@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®