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

Commit 28d213ba authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Diplays more output on features check for make V=1 



Adding more verbose output for compile time features checking, to ease
up debuging of feature detection failures.

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-fbjha6xs5soyaiek8j4142xg@git.kernel.org


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

tools/perf/Makefile

+23 −23
Original line number Diff line number Diff line
@@ -155,15 +155,15 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 


-include config/feature-tests.mak



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)

	CFLAGS := $(CFLAGS) -fstack-protector-all

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector,-Wstack-protector),y)

       CFLAGS := $(CFLAGS) -Wstack-protector

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var),y)

ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var,-Wvolatile-register-var),y)

       CFLAGS := $(CFLAGS) -Wvolatile-register-var

endif
@@ -172,7 +172,7 @@ endif 
BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

BASIC_LDFLAGS =



ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS)),y)

ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)

	BIONIC := 1

	EXTLIBS := $(filter-out -lrt,$(EXTLIBS))

	EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
@@ -477,9 +477,9 @@ ifdef NO_LIBELF 
	NO_LIBUNWIND := 1

else

FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS)

ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y)

ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)

	FLAGS_GLIBC=$(ALL_CFLAGS) $(ALL_LDFLAGS)

	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC)),y)

	ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y)

		LIBC_SUPPORT := 1

	endif

	ifeq ($(BIONIC),1)
@@ -494,7 +494,7 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) 
	endif

else

	FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS)

	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)

	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)

		msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);

		NO_DWARF := 1

	endif # Dwarf support
@@ -510,7 +510,7 @@ ifdef LIBUNWIND_DIR 
endif



FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(ALL_CFLAGS) $(LIBUNWIND_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS)

ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND)),y)

ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y)

	msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99);

	NO_LIBUNWIND := 1

endif # Libunwind support
@@ -539,7 +539,7 @@ LIB_OBJS += $(OUTPUT)util/symbol-minimal.o 
else # NO_LIBELF

BASIC_CFLAGS += -DLIBELF_SUPPORT



ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON)),y)

ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON),-DLIBELF_MMAP),y)

	BASIC_CFLAGS += -DLIBELF_MMAP

endif
@@ -565,7 +565,7 @@ endif 


ifndef NO_LIBAUDIT

	FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit

	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y)

	ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y)

		msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev);

	else

		BASIC_CFLAGS += -DLIBAUDIT_SUPPORT
@@ -576,7 +576,7 @@ endif 


ifndef NO_NEWT

	FLAGS_NEWT=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -lnewt

	ifneq ($(call try-cc,$(SOURCE_NEWT),$(FLAGS_NEWT)),y)

	ifneq ($(call try-cc,$(SOURCE_NEWT),$(FLAGS_NEWT),libnewt),y)

		msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev);

	else

		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
@@ -605,10 +605,10 @@ endif 


ifndef NO_GTK2

	FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null)

	ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)

	ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y)

		msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);

	else

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2)),y)

		ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y)

			BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR

		endif

		BASIC_CFLAGS += -DGTK2_SUPPORT
@@ -635,7 +635,7 @@ else 
	PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`

	FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)



	ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)

	ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED),perl),y)

		BASIC_CFLAGS += -DNO_LIBPERL

	else

               ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
@@ -689,11 +689,11 @@ else 
      PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)

      FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)



      ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)

      ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED),python),y)

        $(call disable-python,Python.h (for Python 2.x))

      else



        ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED)),y)

        ifneq ($(call try-cc,$(SOURCE_PYTHON_VERSION),$(FLAGS_PYTHON_EMBED),python version),y)

          $(warning Python 3 is not yet supported; please set)

          $(warning PYTHON and/or PYTHON_CONFIG appropriately.)

          $(warning If you also have Python 2 installed, then)
@@ -727,22 +727,22 @@ else 
		BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

        else

		FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd

		has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))

		has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD),libbfd)

		ifeq ($(has_bfd),y)

			EXTLIBS += -lbfd

		else

			FLAGS_BFD_IBERTY=$(FLAGS_BFD) -liberty

			has_bfd_iberty := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY))

			has_bfd_iberty := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY),liberty)

			ifeq ($(has_bfd_iberty),y)

				EXTLIBS += -lbfd -liberty

			else

				FLAGS_BFD_IBERTY_Z=$(FLAGS_BFD_IBERTY) -lz

				has_bfd_iberty_z := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY_Z))

				has_bfd_iberty_z := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD_IBERTY_Z),libz)

				ifeq ($(has_bfd_iberty_z),y)

					EXTLIBS += -lbfd -liberty -lz

				else

					FLAGS_CPLUS_DEMANGLE=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -liberty

					has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE))

					has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE),demangle)

					ifeq ($(has_cplus_demangle),y)

						EXTLIBS += -liberty

						BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE
@@ -764,19 +764,19 @@ ifeq ($(NO_PERF_REGS),0) 
endif



ifndef NO_STRLCPY

	ifeq ($(call try-cc,$(SOURCE_STRLCPY),),y)

	ifeq ($(call try-cc,$(SOURCE_STRLCPY),,-DHAVE_STRLCPY),y)

		BASIC_CFLAGS += -DHAVE_STRLCPY

	endif

endif



ifndef NO_ON_EXIT

	ifeq ($(call try-cc,$(SOURCE_ON_EXIT),),y)

	ifeq ($(call try-cc,$(SOURCE_ON_EXIT),,-DHAVE_ON_EXIT),y)

		BASIC_CFLAGS += -DHAVE_ON_EXIT

	endif

endif



ifndef NO_BACKTRACE

       ifeq ($(call try-cc,$(SOURCE_BACKTRACE),),y)

       ifeq ($(call try-cc,$(SOURCE_BACKTRACE),,-DBACKTRACE_SUPPORT),y)

               BASIC_CFLAGS += -DBACKTRACE_SUPPORT

       endif

endif

tools/perf/config/utilities.mak

+9 −2
Original line number Diff line number Diff line
@@ -180,9 +180,16 @@ _gea_warn = $(warning The path '$(1)' is not executable.) 
_gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))



# try-cc

# Usage: option = $(call try-cc, source-to-build, cc-options)

# Usage: option = $(call try-cc, source-to-build, cc-options, msg)

ifndef V

TRY_CC_OUTPUT= > /dev/null 2>&1

else

TRY_CC_MSG=echo "CHK $(3)" 1>&2;

endif



try-cc = $(shell sh -c						  \

	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \

	 $(TRY_CC_MSG)						  \

	 echo "$(1)" |						  \

	 $(CC) -x c - $(2) -o "$$TMP" > /dev/null 2>&1 && echo y; \

	 $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \

	 rm -f "$$TMP"')