* [PATCH 1/6] tools build tests: Don't hardcode gcc name
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-29 21:22 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 2/6] perf tools: Allow external definition of flex and bison binary names David Carrillo-Cisneros
` (5 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
Use $(CC) instead of harcoded gcc binary name.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/build/tests/ex/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/build/tests/ex/Makefile b/tools/build/tests/ex/Makefile
index c50d5782ad5a..027d6c8a58a7 100644
--- a/tools/build/tests/ex/Makefile
+++ b/tools/build/tests/ex/Makefile
@@ -8,7 +8,7 @@ ex:
include $(srctree)/tools/build/Makefile.include
ex: ex-in.o libex-in.o
- gcc -o $@ $^
+ $(CC) -o $@ $^
ex.%: fixdep FORCE
make -f $(srctree)/tools/build/Makefile.build dir=. $@
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:perf/core] tools build tests: Don't hardcode gcc name
2017-08-27 7:54 ` [PATCH 1/6] tools build tests: Don't hardcode gcc name David Carrillo-Cisneros
@ 2017-08-29 21:22 ` tip-bot for David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: tip-bot for David Carrillo-Cisneros @ 2017-08-29 21:22 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, davidcc, linux-kernel, acme, jolsa, hpa, tglx,
alexander.shishkin, eranian, pjt
Commit-ID: ba5d1a48aab56a2677113d071b5b1446877b9a1a
Gitweb: http://git.kernel.org/tip/ba5d1a48aab56a2677113d071b5b1446877b9a1a
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 27 Aug 2017 00:54:37 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 28 Aug 2017 16:44:44 -0300
tools build tests: Don't hardcode gcc name
Use $(CC) instead of harcoded gcc binary name.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20170827075442.108534-2-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/tests/ex/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/build/tests/ex/Makefile b/tools/build/tests/ex/Makefile
index c50d578..027d6c8 100644
--- a/tools/build/tests/ex/Makefile
+++ b/tools/build/tests/ex/Makefile
@@ -8,7 +8,7 @@ ex:
include $(srctree)/tools/build/Makefile.include
ex: ex-in.o libex-in.o
- gcc -o $@ $^
+ $(CC) -o $@ $^
ex.%: fixdep FORCE
make -f $(srctree)/tools/build/Makefile.build dir=. $@
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/6] perf tools: Allow external definition of flex and bison binary names
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 1/6] tools build tests: Don't hardcode gcc name David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-29 21:23 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 3/6] tools lib: Allow external definition of CC, AR and LD David Carrillo-Cisneros
` (4 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
Allow user to define flex and bison binary names by passing
FLEX and BISON variables.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/perf/Makefile.perf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index a700a079a218..58924eb0f40b 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -164,8 +164,8 @@ LN = ln -f
MKDIR = mkdir
FIND = find
INSTALL = install
-FLEX = flex
-BISON = bison
+FLEX ?= flex
+BISON ?= bison
STRIP = strip
AWK = awk
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:perf/core] perf tools: Allow external definition of flex and bison binary names
2017-08-27 7:54 ` [PATCH 2/6] perf tools: Allow external definition of flex and bison binary names David Carrillo-Cisneros
@ 2017-08-29 21:23 ` tip-bot for David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: tip-bot for David Carrillo-Cisneros @ 2017-08-29 21:23 UTC (permalink / raw)
To: linux-tip-commits
Cc: alexander.shishkin, hpa, acme, davidcc, tglx, eranian, jolsa,
linux-kernel, mingo, pjt
Commit-ID: 39a59f1e3ea541035637432db39158a461f29146
Gitweb: http://git.kernel.org/tip/39a59f1e3ea541035637432db39158a461f29146
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 27 Aug 2017 00:54:38 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 28 Aug 2017 16:44:45 -0300
perf tools: Allow external definition of flex and bison binary names
Allow user to define flex and bison binary names by passing FLEX and
BISON variables.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20170827075442.108534-3-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile.perf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index a700a07..58924eb 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -164,8 +164,8 @@ LN = ln -f
MKDIR = mkdir
FIND = find
INSTALL = install
-FLEX = flex
-BISON = bison
+FLEX ?= flex
+BISON ?= bison
STRIP = strip
AWK = awk
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/6] tools lib: Allow external definition of CC, AR and LD
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 1/6] tools build tests: Don't hardcode gcc name David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 2/6] perf tools: Allow external definition of flex and bison binary names David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-29 21:23 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 4/6] perf tools: Robustify detection of clang binary David Carrillo-Cisneros
` (3 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
Use already defined values for CC, AR and LD when available.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/lib/api/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index eb6e0b36bfc1..2538675731c7 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -8,9 +8,9 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
#$(info Determined 'srctree' to be $(srctree))
endif
-CC = $(CROSS_COMPILE)gcc
-AR = $(CROSS_COMPILE)ar
-LD = $(CROSS_COMPILE)ld
+CC ?= $(CROSS_COMPILE)gcc
+AR ?= $(CROSS_COMPILE)ar
+LD ?= $(CROSS_COMPILE)ld
MAKEFLAGS += --no-print-directory
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:perf/core] tools lib: Allow external definition of CC, AR and LD
2017-08-27 7:54 ` [PATCH 3/6] tools lib: Allow external definition of CC, AR and LD David Carrillo-Cisneros
@ 2017-08-29 21:23 ` tip-bot for David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: tip-bot for David Carrillo-Cisneros @ 2017-08-29 21:23 UTC (permalink / raw)
To: linux-tip-commits
Cc: davidcc, jolsa, hpa, acme, linux-kernel, mingo,
alexander.shishkin, eranian, tglx, pjt
Commit-ID: 12024aacb0170779cd0b976b06d2e9b1767cf142
Gitweb: http://git.kernel.org/tip/12024aacb0170779cd0b976b06d2e9b1767cf142
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 27 Aug 2017 00:54:39 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 28 Aug 2017 16:44:45 -0300
tools lib: Allow external definition of CC, AR and LD
Use already defined values for CC, AR and LD when available.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20170827075442.108534-4-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/api/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index eb6e0b3..2538675 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -8,9 +8,9 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
#$(info Determined 'srctree' to be $(srctree))
endif
-CC = $(CROSS_COMPILE)gcc
-AR = $(CROSS_COMPILE)ar
-LD = $(CROSS_COMPILE)ld
+CC ?= $(CROSS_COMPILE)gcc
+AR ?= $(CROSS_COMPILE)ar
+LD ?= $(CROSS_COMPILE)ld
MAKEFLAGS += --no-print-directory
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/6] perf tools: Robustify detection of clang binary
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
` (2 preceding siblings ...)
2017-08-27 7:54 ` [PATCH 3/6] tools lib: Allow external definition of CC, AR and LD David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-29 21:23 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-08-27 7:54 ` [PATCH 5/6] perf tools: Remove BUG_ON char[] to bool implicit conversions David Carrillo-Cisneros
` (2 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
Prior to this patch, make scripts tested for CLANG with
ifeq ($(CC), clang), failing to detect CLANG binaries with
different names. Fix it by testing for the existence of
__clang__ macro in the list of compiler defined macros.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/lib/api/Makefile | 2 +-
tools/lib/subcmd/Makefile | 2 +-
tools/perf/Makefile.config | 4 ++--
tools/perf/util/intel-pt-decoder/Build | 2 +-
tools/scripts/Makefile.include | 4 +++-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index 2538675731c7..4563ba7ede6f 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -19,7 +19,7 @@ LIBFILE = $(OUTPUT)libapi.a
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
index 3d1c3b5b5150..7e9f03c97e4c 100644
--- a/tools/lib/subcmd/Makefile
+++ b/tools/lib/subcmd/Makefile
@@ -21,7 +21,7 @@ LIBFILE = $(OUTPUT)libsubcmd.a
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 6a64c6bbd9a5..63f534a0902f 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -148,7 +148,7 @@ ifndef DEBUG
endif
ifeq ($(DEBUG),0)
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
@@ -184,7 +184,7 @@ ifdef PYTHON_CONFIG
PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil
PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
- ifeq ($(CC), clang)
+ ifeq ($(CC_NO_CLANG), 1)
PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))
endif
FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel-pt-decoder/Build
index 7aca5d6d7e1f..10e0814bb8d2 100644
--- a/tools/perf/util/intel-pt-decoder/Build
+++ b/tools/perf/util/intel-pt-decoder/Build
@@ -25,6 +25,6 @@ $(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: util/intel-pt-decoder/in
CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder
-ifneq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 1)
CFLAGS_intel-pt-insn-decoder.o += -Wno-override-init
endif
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
index ccad8ce925e4..1e8b6116ba3c 100644
--- a/tools/scripts/Makefile.include
+++ b/tools/scripts/Makefile.include
@@ -39,7 +39,9 @@ EXTRA_WARNINGS += -Wundef
EXTRA_WARNINGS += -Wwrite-strings
EXTRA_WARNINGS += -Wformat
-ifneq ($(CC), clang)
+CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
+
+ifeq ($(CC_NO_CLANG), 1)
EXTRA_WARNINGS += -Wstrict-aliasing=3
endif
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:perf/core] perf tools: Robustify detection of clang binary
2017-08-27 7:54 ` [PATCH 4/6] perf tools: Robustify detection of clang binary David Carrillo-Cisneros
@ 2017-08-29 21:23 ` tip-bot for David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: tip-bot for David Carrillo-Cisneros @ 2017-08-29 21:23 UTC (permalink / raw)
To: linux-tip-commits
Cc: pjt, alexander.shishkin, jolsa, davidcc, acme, hpa, eranian,
tglx, mingo, linux-kernel
Commit-ID: 3866058ef15b6ae6f4ff48e088428b46bcc43fa1
Gitweb: http://git.kernel.org/tip/3866058ef15b6ae6f4ff48e088428b46bcc43fa1
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 27 Aug 2017 00:54:40 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 28 Aug 2017 16:44:46 -0300
perf tools: Robustify detection of clang binary
Prior to this patch, make scripts tested for CLANG with ifeq ($(CC),
clang), failing to detect CLANG binaries with different names. Fix it by
testing for the existence of __clang__ macro in the list of compiler
defined macros.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20170827075442.108534-5-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/api/Makefile | 2 +-
tools/lib/subcmd/Makefile | 2 +-
tools/perf/Makefile.config | 4 ++--
tools/perf/util/intel-pt-decoder/Build | 2 +-
tools/scripts/Makefile.include | 4 +++-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index 2538675..4563ba7 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -19,7 +19,7 @@ LIBFILE = $(OUTPUT)libapi.a
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
index 3d1c3b5..7e9f03c 100644
--- a/tools/lib/subcmd/Makefile
+++ b/tools/lib/subcmd/Makefile
@@ -21,7 +21,7 @@ LIBFILE = $(OUTPUT)libsubcmd.a
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 6a64c6b..63f534a 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -148,7 +148,7 @@ ifndef DEBUG
endif
ifeq ($(DEBUG),0)
-ifeq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 0)
CFLAGS += -O3
else
CFLAGS += -O6
@@ -184,7 +184,7 @@ ifdef PYTHON_CONFIG
PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil
PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
- ifeq ($(CC), clang)
+ ifeq ($(CC_NO_CLANG), 1)
PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))
endif
FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel-pt-decoder/Build
index 7aca5d6..10e0814 100644
--- a/tools/perf/util/intel-pt-decoder/Build
+++ b/tools/perf/util/intel-pt-decoder/Build
@@ -25,6 +25,6 @@ $(OUTPUT)util/intel-pt-decoder/intel-pt-insn-decoder.o: util/intel-pt-decoder/in
CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder
-ifneq ($(CC), clang)
+ifeq ($(CC_NO_CLANG), 1)
CFLAGS_intel-pt-insn-decoder.o += -Wno-override-init
endif
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
index ccad8ce..1e8b611 100644
--- a/tools/scripts/Makefile.include
+++ b/tools/scripts/Makefile.include
@@ -39,7 +39,9 @@ EXTRA_WARNINGS += -Wundef
EXTRA_WARNINGS += -Wwrite-strings
EXTRA_WARNINGS += -Wformat
-ifneq ($(CC), clang)
+CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
+
+ifeq ($(CC_NO_CLANG), 1)
EXTRA_WARNINGS += -Wstrict-aliasing=3
endif
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/6] perf tools: Remove BUG_ON char[] to bool implicit conversions
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
` (3 preceding siblings ...)
2017-08-27 7:54 ` [PATCH 4/6] perf tools: Robustify detection of clang binary David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-28 9:33 ` Jiri Olsa
2017-08-27 7:54 ` [PATCH 6/6] perf tools: Pass full path of FEATURES_DUMP David Carrillo-Cisneros
2017-08-28 9:34 ` [PATCH 0/6] perf tools: Minor build fixes Jiri Olsa
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
When compiling with LLVM, errors like this are shown:
builtin-lock.c:46:10: error: implicit conversion turns string literal into bool: 'const char [39]' to 'bool'
Due to error message implicit conversion into bool. Fix it by defining a
BUG macro without a boolean argument and use it instead.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/include/linux/kernel.h | 2 ++
tools/perf/builtin-lock.c | 15 ++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
index 77d2e94ca5df..0951c96205c4 100644
--- a/tools/include/linux/kernel.h
+++ b/tools/include/linux/kernel.h
@@ -70,6 +70,8 @@
#endif
#endif
+#define BUG() abort()
+
#if __BYTE_ORDER == __BIG_ENDIAN
#define cpu_to_le16 bswap_16
#define cpu_to_le32 bswap_32
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index ff98652484a7..7d1e42cccc89 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -152,7 +152,8 @@ static void thread_stat_insert(struct thread_stat *new)
else if (new->tid > p->tid)
rb = &(*rb)->rb_right;
else
- BUG_ON("inserting invalid thread_stat\n");
+ pr_err("inserting invalid thread_stat\n");
+ BUG();
}
rb_link_node(&new->rb, parent, rb);
@@ -457,7 +458,8 @@ static int report_lock_acquire_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
+ pr_err("Unknown state of lock sequence found!\n");
+ BUG();
break;
}
@@ -518,7 +520,8 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
+ pr_err("Unknown state of lock sequence found!\n");
+ BUG();
break;
}
@@ -573,7 +576,8 @@ static int report_lock_contended_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
+ pr_err("Unknown state of lock sequence found!\n");
+ BUG();
break;
}
@@ -632,7 +636,8 @@ static int report_lock_release_event(struct perf_evsel *evsel,
bad_hist[BROKEN_RELEASE]++;
goto free_seq;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
+ pr_err("Unknown state of lock sequence found!\n");
+ BUG();
break;
}
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 5/6] perf tools: Remove BUG_ON char[] to bool implicit conversions
2017-08-27 7:54 ` [PATCH 5/6] perf tools: Remove BUG_ON char[] to bool implicit conversions David Carrillo-Cisneros
@ 2017-08-28 9:33 ` Jiri Olsa
2017-08-28 18:30 ` [PATCH] " David Carrillo-Cisneros
0 siblings, 1 reply; 17+ messages in thread
From: Jiri Olsa @ 2017-08-28 9:33 UTC (permalink / raw)
To: David Carrillo-Cisneros
Cc: linux-kernel, Arnaldo Carvalho de Melo, Alexander Shishkin,
Stephane Eranian, Paul Turner
On Sun, Aug 27, 2017 at 12:54:41AM -0700, David Carrillo-Cisneros wrote:
> When compiling with LLVM, errors like this are shown:
>
> builtin-lock.c:46:10: error: implicit conversion turns string literal into bool: 'const char [39]' to 'bool'
>
> Due to error message implicit conversion into bool. Fix it by defining a
> BUG macro without a boolean argument and use it instead.
>
> Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
> ---
> tools/include/linux/kernel.h | 2 ++
> tools/perf/builtin-lock.c | 15 ++++++++++-----
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
> index 77d2e94ca5df..0951c96205c4 100644
> --- a/tools/include/linux/kernel.h
> +++ b/tools/include/linux/kernel.h
> @@ -70,6 +70,8 @@
> #endif
> #endif
>
> +#define BUG() abort()
we have some of those in tools/include/asm/bug.h
some might suit you, I think we wanted to omit BUG calls completely
jirka
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] perf tools: Remove BUG_ON char[] to bool implicit conversions
2017-08-28 9:33 ` Jiri Olsa
@ 2017-08-28 18:30 ` David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-28 18:30 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
When compiling with LLVM, errors like this are shown:
builtin-lock.c:46:10: error: implicit conversion turns string literal into bool: 'const char [39]' to 'bool'
due to error message implicit conversion into bool. Fix it printing
the error message and returning an error when possible.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/perf/builtin-lock.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index ff98652484a7..55d3997ce194 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -3,6 +3,7 @@
#include "builtin.h"
#include "perf.h"
+#include "asm/bug.h"
#include "util/evlist.h"
#include "util/evsel.h"
#include "util/util.h"
@@ -147,12 +148,11 @@ static void thread_stat_insert(struct thread_stat *new)
p = container_of(*rb, struct thread_stat, rb);
parent = *rb;
+ WARN(new->tid == p->tid, "inserting invalid thread_stat\n");
if (new->tid < p->tid)
rb = &(*rb)->rb_left;
- else if (new->tid > p->tid)
- rb = &(*rb)->rb_right;
else
- BUG_ON("inserting invalid thread_stat\n");
+ rb = &(*rb)->rb_right;
}
rb_link_node(&new->rb, parent, rb);
@@ -457,8 +457,8 @@ static int report_lock_acquire_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
- break;
+ pr_err("Unknown state of lock sequence found!\n");
+ return -1;
}
ls->nr_acquire++;
@@ -518,8 +518,8 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
- break;
+ pr_err("Unknown state of lock sequence found!\n");
+ return -1;
}
seq->state = SEQ_STATE_ACQUIRED;
@@ -573,8 +573,8 @@ static int report_lock_contended_event(struct perf_evsel *evsel,
free(seq);
goto end;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
- break;
+ pr_err("Unknown state of lock sequence found!\n");
+ return -1;
}
seq->state = SEQ_STATE_CONTENDED;
@@ -632,8 +632,8 @@ static int report_lock_release_event(struct perf_evsel *evsel,
bad_hist[BROKEN_RELEASE]++;
goto free_seq;
default:
- BUG_ON("Unknown state of lock sequence found!\n");
- break;
+ pr_err("Unknown state of lock sequence found!\n");
+ return -1;
}
ls->nr_release++;
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/6] perf tools: Pass full path of FEATURES_DUMP
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
` (4 preceding siblings ...)
2017-08-27 7:54 ` [PATCH 5/6] perf tools: Remove BUG_ON char[] to bool implicit conversions David Carrillo-Cisneros
@ 2017-08-27 7:54 ` David Carrillo-Cisneros
2017-08-29 21:24 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-08-28 9:34 ` [PATCH 0/6] perf tools: Minor build fixes Jiri Olsa
6 siblings, 1 reply; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-27 7:54 UTC (permalink / raw)
To: linux-kernel
Cc: Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
Stephane Eranian, Paul Turner, David Carrillo-Cisneros
When building with an external FEATURES_DUMP, bpf complains
that features dump file is not found. Fix it by passing full file path.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/perf/Makefile.perf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 58924eb0f40b..a5bf3100f812 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -240,7 +240,7 @@ endif
ifeq ($(FEATURES_DUMP),)
FEATURE_DUMP_EXPORT := $(realpath $(OUTPUT)FEATURE-DUMP)
else
-FEATURE_DUMP_EXPORT := $(FEATURES_DUMP)
+FEATURE_DUMP_EXPORT := $(realpath $(FEATURES_DUMP))
endif
export prefix bindir sharedir sysconfdir DESTDIR
--
2.14.1.342.g6490525c54-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:perf/core] perf tools: Pass full path of FEATURES_DUMP
2017-08-27 7:54 ` [PATCH 6/6] perf tools: Pass full path of FEATURES_DUMP David Carrillo-Cisneros
@ 2017-08-29 21:24 ` tip-bot for David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: tip-bot for David Carrillo-Cisneros @ 2017-08-29 21:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, mingo, eranian, hpa, davidcc, linux-kernel, pjt, tglx,
alexander.shishkin, jolsa
Commit-ID: 70ff7c6caa2f2cee4a7621f5cb3b73b0a38327f1
Gitweb: http://git.kernel.org/tip/70ff7c6caa2f2cee4a7621f5cb3b73b0a38327f1
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 27 Aug 2017 00:54:42 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 28 Aug 2017 16:44:46 -0300
perf tools: Pass full path of FEATURES_DUMP
When building with an external FEATURES_DUMP, bpf complains
that features dump file is not found. Fix it by passing full file path.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Paul Turner <pjt@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20170827075442.108534-7-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile.perf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 58924eb..a5bf310 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -240,7 +240,7 @@ endif
ifeq ($(FEATURES_DUMP),)
FEATURE_DUMP_EXPORT := $(realpath $(OUTPUT)FEATURE-DUMP)
else
-FEATURE_DUMP_EXPORT := $(FEATURES_DUMP)
+FEATURE_DUMP_EXPORT := $(realpath $(FEATURES_DUMP))
endif
export prefix bindir sharedir sysconfdir DESTDIR
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 0/6] perf tools: Minor build fixes
2017-08-27 7:54 [PATCH 0/6] perf tools: Minor build fixes David Carrillo-Cisneros
` (5 preceding siblings ...)
2017-08-27 7:54 ` [PATCH 6/6] perf tools: Pass full path of FEATURES_DUMP David Carrillo-Cisneros
@ 2017-08-28 9:34 ` Jiri Olsa
2017-08-28 14:16 ` Arnaldo Carvalho de Melo
6 siblings, 1 reply; 17+ messages in thread
From: Jiri Olsa @ 2017-08-28 9:34 UTC (permalink / raw)
To: David Carrillo-Cisneros
Cc: linux-kernel, Arnaldo Carvalho de Melo, Alexander Shishkin,
Stephane Eranian, Paul Turner
On Sun, Aug 27, 2017 at 12:54:36AM -0700, David Carrillo-Cisneros wrote:
> Collection of minor fixes to compile with LLVM and
> non-standard tool names.
>
> David Carrillo-Cisneros (6):
> tools build tests: Don't hardcode gcc name
> perf tools: Allow external definition of flex and bison binary names
> tools lib: Allow external definition of CC, AR and LD
> perf tools: Robustify detection of clang binary
> perf tools: Remove BUG_ON char[] to bool implicit conversions
> perf tools: Pass full path of FEATURES_DUMP
apart from comment for 5/6 I'm ok with this
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 0/6] perf tools: Minor build fixes
2017-08-28 9:34 ` [PATCH 0/6] perf tools: Minor build fixes Jiri Olsa
@ 2017-08-28 14:16 ` Arnaldo Carvalho de Melo
2017-08-28 18:31 ` David Carrillo-Cisneros
0 siblings, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-08-28 14:16 UTC (permalink / raw)
To: Jiri Olsa
Cc: David Carrillo-Cisneros, linux-kernel, Alexander Shishkin,
Stephane Eranian, Paul Turner
Em Mon, Aug 28, 2017 at 11:34:21AM +0200, Jiri Olsa escreveu:
> On Sun, Aug 27, 2017 at 12:54:36AM -0700, David Carrillo-Cisneros wrote:
> > Collection of minor fixes to compile with LLVM and
> > non-standard tool names.
> >
> > David Carrillo-Cisneros (6):
> > tools build tests: Don't hardcode gcc name
> > perf tools: Allow external definition of flex and bison binary names
> > tools lib: Allow external definition of CC, AR and LD
> > perf tools: Robustify detection of clang binary
> > perf tools: Remove BUG_ON char[] to bool implicit conversions
> > perf tools: Pass full path of FEATURES_DUMP
>
> apart from comment for 5/6 I'm ok with this
>
> Acked-by: Jiri Olsa <jolsa@kernel.org>
Thanks, applied all that Jiri acked, agree with him that BUG should be
avoided, and also that we should use existing facilities when available,
and when there aren't, try to replicate as best as we can similar
facilities existing in the kernel source code.
- Arnaldo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/6] perf tools: Minor build fixes
2017-08-28 14:16 ` Arnaldo Carvalho de Melo
@ 2017-08-28 18:31 ` David Carrillo-Cisneros
0 siblings, 0 replies; 17+ messages in thread
From: David Carrillo-Cisneros @ 2017-08-28 18:31 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, linux-kernel, Alexander Shishkin, Stephane Eranian,
Paul Turner
On Mon, Aug 28, 2017 at 7:16 AM, Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
> Em Mon, Aug 28, 2017 at 11:34:21AM +0200, Jiri Olsa escreveu:
>> On Sun, Aug 27, 2017 at 12:54:36AM -0700, David Carrillo-Cisneros wrote:
>> > Collection of minor fixes to compile with LLVM and
>> > non-standard tool names.
>> >
>> > David Carrillo-Cisneros (6):
>> > tools build tests: Don't hardcode gcc name
>> > perf tools: Allow external definition of flex and bison binary names
>> > tools lib: Allow external definition of CC, AR and LD
>> > perf tools: Robustify detection of clang binary
>> > perf tools: Remove BUG_ON char[] to bool implicit conversions
>> > perf tools: Pass full path of FEATURES_DUMP
>>
>> apart from comment for 5/6 I'm ok with this
>>
>> Acked-by: Jiri Olsa <jolsa@kernel.org>
>
> Thanks, applied all that Jiri acked, agree with him that BUG should be
> avoided, and also that we should use existing facilities when available,
> and when there aren't, try to replicate as best as we can similar
> facilities existing in the kernel source code.
Thank you for applying them. I sent a new version of the one commented by Jiri.
David
>
> - Arnaldo
^ permalink raw reply [flat|nested] 17+ messages in thread