Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3866058e authored Aug 27, 2017 by David Carrillo-Cisneros Committed by Arnaldo Carvalho de Melo Aug 28, 2017

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>

parent 12024aac

tools/lib/api/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ LIBFILE = $(OUTPUT)libapi.a
	CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)		CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
	CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC		CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC

	ifeq ($(CC), clang)		ifeq ($(CC_NO_CLANG), 0)
	CFLAGS += -O3		CFLAGS += -O3
	else		else
	CFLAGS += -O6		CFLAGS += -O6

tools/lib/subcmd/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ LIBFILE = $(OUTPUT)libsubcmd.a
	CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)		CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
	CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC		CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC

	ifeq ($(CC), clang)		ifeq ($(CC_NO_CLANG), 0)
	CFLAGS += -O3		CFLAGS += -O3
	else		else
	CFLAGS += -O6		CFLAGS += -O6

tools/perf/Makefile.config

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -148,7 +148,7 @@ ifndef DEBUG
	endif		endif

	ifeq ($(DEBUG),0)		ifeq ($(DEBUG),0)
	ifeq ($(CC), clang)		ifeq ($(CC_NO_CLANG), 0)
	CFLAGS += -O3		CFLAGS += -O3
	else		else
	CFLAGS += -O6		CFLAGS += -O6
	@@ -184,7 +184,7 @@ ifdef PYTHON_CONFIG
	PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))		PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
	PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil		PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil
	PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)		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))		PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))
	endif		endif
	FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)		FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)

tools/perf/util/intel-pt-decoder/Build

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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		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		CFLAGS_intel-pt-insn-decoder.o += -Wno-override-init
	endif		endif

tools/scripts/Makefile.include

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,9 @@ EXTRA_WARNINGS += -Wundef
	EXTRA_WARNINGS += -Wwrite-strings		EXTRA_WARNINGS += -Wwrite-strings
	EXTRA_WARNINGS += -Wformat		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		EXTRA_WARNINGS += -Wstrict-aliasing=3
	endif		endif