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

Commit 1448fef4 authored by Jean Pihet's avatar Jean Pihet Committed by Arnaldo Carvalho de Melo
Browse files

perf unwinding: Use the per-feature check flags 



Use the per-feature check flags for the unwinding feature in order to
correctly compile the test-all, libunwind and libunwind-debug-frame
feature checks.

Tested on x86_64, ARMv7 and ARMv8 with and without LIBUNWIND_DIR set in
'make -C tools/perf'

Signed-off-by: default avatarJean Pihet <jean.pihet@linaro.org>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linaro-kernel@lists.linaro.org
Cc: patches@linaro.org
Link: http://lkml.kernel.org/r/1386678244-13535-3-git-send-email-jean.pihet@linaro.org


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

tools/perf/config/Makefile

+30 −22
Original line number Diff line number Diff line
@@ -36,6 +36,30 @@ ifeq ($(ARCH),arm) 
  LIBUNWIND_LIBS = -lunwind -lunwind-arm

endif



ifeq ($(LIBUNWIND_LIBS),)

  NO_LIBUNWIND := 1

else

  #

  # For linking with debug library, run like:

  #

  #   make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/

  #

  ifdef LIBUNWIND_DIR

    LIBUNWIND_CFLAGS  = -I$(LIBUNWIND_DIR)/include

    LIBUNWIND_LDFLAGS = -L$(LIBUNWIND_DIR)/lib

  endif

  LIBUNWIND_LDFLAGS += $(LIBUNWIND_LIBS)



  # Set per-feature check compilation flags

  FEATURE_CHECK_CFLAGS-libunwind = $(LIBUNWIND_CFLAGS)

  FEATURE_CHECK_LDFLAGS-libunwind = $(LIBUNWIND_LDFLAGS)

  FEATURE_CHECK_CFLAGS-libunwind-debug-frame = $(LIBUNWIND_CFLAGS)

  FEATURE_CHECK_LDFLAGS-libunwind-debug-frame = $(LIBUNWIND_LDFLAGS)

  #  and the flags for the test-all case

  FEATURE_CHECK_CFLAGS-all += $(LIBUNWIND_CFLAGS)

  FEATURE_CHECK_LDFLAGS-all += $(LIBUNWIND_LDFLAGS)

endif



ifeq ($(NO_PERF_REGS),0)

  CFLAGS += -DHAVE_PERF_REGS_SUPPORT

endif
@@ -102,7 +126,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))" LIBUNWIND_LIBS="$(LIBUNWIND_LIBS)" -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)

  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)

endef



feature_set = $(eval $(feature_set_code))
@@ -305,21 +329,7 @@ ifndef NO_LIBELF 
  endif # NO_DWARF

endif # NO_LIBELF



ifeq ($(LIBUNWIND_LIBS),)

  NO_LIBUNWIND := 1

endif



ifndef NO_LIBUNWIND

  #

  # For linking with debug library, run like:

  #

  #   make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/

  #

  ifdef LIBUNWIND_DIR

    LIBUNWIND_CFLAGS  := -I$(LIBUNWIND_DIR)/include

    LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib

  endif



  ifneq ($(feature-libunwind), 1)

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

    NO_LIBUNWIND := 1
@@ -334,14 +344,12 @@ ifndef NO_LIBUNWIND 
      # non-ARM has no dwarf_find_debug_frame() function:

      CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME

    endif

  endif

endif



ifndef NO_LIBUNWIND

    CFLAGS += -DHAVE_LIBUNWIND_SUPPORT

    EXTLIBS += $(LIBUNWIND_LIBS)

    CFLAGS += $(LIBUNWIND_CFLAGS)

    LDFLAGS += $(LIBUNWIND_LDFLAGS)

  endif # ifneq ($(feature-libunwind), 1)

endif



ifndef NO_LIBAUDIT

tools/perf/config/feature-checks/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ CC := $(CC) -MD 


all: $(FILES)



BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c

BUILD = $(CC) $(CFLAGS) -o $(OUTPUT)$@ $@.c $(LDFLAGS)



###############################



test-all:

	$(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl

	$(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl



test-hello:

	$(BUILD)
@@ -70,10 +70,10 @@ test-libnuma: 
	$(BUILD) -lnuma



test-libunwind:

	$(BUILD) $(LIBUNWIND_LIBS) -lelf

	$(BUILD) -lelf



test-libunwind-debug-frame:

	$(BUILD) $(LIBUNWIND_LIBS) -lelf

	$(BUILD) -lelf



test-libaudit:

	$(BUILD) -laudit