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

Commit 8bd8c653 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools perf scripting python: clang doesn't have -spec, remove it 

Gcc has a -spec option to override what options to pass to cc, etc, and
in some distros this is used, like in fedora, where we end up getting
this passed to gcc that makes clang, that doesn't have this option to
stop the build:

  CC       /tmp/build/perf/util/scripting-engines/trace-event-python.o
clang-4.0: error: argument unused during compilation: '-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1' [-Werror,-Wunused-command-line-argument]

So filter this out when the compiler used is clang, this way we
can build the python scripting support in tools/perf/.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2gosxoiouf24pnlknp7w7q4z@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0c8967c9

tools/perf/Makefile.config

+7 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,10 @@ PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG)) 
PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)

PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null)

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)

  PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))

endif



FEATURE_CHECK_CFLAGS-libpython := $(PYTHON_EMBED_CCOPTS)

FEATURE_CHECK_CFLAGS-libpython := $(PYTHON_EMBED_CCOPTS)

FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)

FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)

FEATURE_CHECK_CFLAGS-libpython-version := $(PYTHON_EMBED_CCOPTS)

FEATURE_CHECK_CFLAGS-libpython-version := $(PYTHON_EMBED_CCOPTS)
@@ -601,6 +605,9 @@ else 
      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)

        PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))

      endif

      FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)

      FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)





      ifneq ($(feature-libpython), 1)

      ifneq ($(feature-libpython), 1)

tools/perf/util/scripting-engines/trace-event-python.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -368,10 +368,10 @@ static PyObject *python_process_callchain(struct perf_sample *sample, 
		if (node->map) {

		if (node->map) {

			struct map *map = node->map;

			struct map *map = node->map;

			const char *dsoname = "[unknown]";

			const char *dsoname = "[unknown]";

			if (map && map->dso && (map->dso->name || map->dso->long_name)) {

			if (map && map->dso) {

				if (symbol_conf.show_kernel_path && map->dso->long_name)

				if (symbol_conf.show_kernel_path && map->dso->long_name)

					dsoname = map->dso->long_name;

					dsoname = map->dso->long_name;

				else if (map->dso->name)

				else

					dsoname = map->dso->name;

					dsoname = map->dso->name;

			}

			}

			pydict_set_item_string_decref(pyelem, "dso",

			pydict_set_item_string_decref(pyelem, "dso",