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

Commit 2cf90407 authored by Jiri Olsa's avatar Jiri Olsa
Browse files

perf tools: Fix bfd dependency libraries detection 



There's false assumption in the library detection code
assuming -liberty and -lz are always present once bfd
is detected. The fails on Ubuntu (14.04) as reported
by Ingo.

Forcing the bdf dependency libraries detection any
time bfd library is detected.

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
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/r/1398676935-6615-1-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent e27a08f5

tools/perf/config/Makefile

+23 −11
Original line number Original line Diff line number Diff line
@@ -194,7 +194,10 @@ VF_FEATURE_TESTS = \ 
	stackprotector-all		\

	stackprotector-all		\

	timerfd				\

	timerfd				\

	libunwind-debug-frame		\

	libunwind-debug-frame		\

	bionic

	bionic				\

	liberty				\

	liberty-z			\

	cplus-demangle





# Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features.

# Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features.

# If in the future we need per-feature checks/flags for features not

# If in the future we need per-feature checks/flags for features not
@@ -512,7 +515,21 @@ else 
endif

endif





ifeq ($(feature-libbfd), 1)

ifeq ($(feature-libbfd), 1)

  EXTLIBS += -lbfd -lz -liberty

  EXTLIBS += -lbfd



  # call all detections now so we get correct

  # status in VF output

  $(call feature_check,liberty)

  $(call feature_check,liberty-z)

  $(call feature_check,cplus-demangle)



  ifeq ($(feature-liberty), 1)

    EXTLIBS += -liberty

  else

    ifeq ($(feature-liberty-z), 1)

      EXTLIBS += -liberty -lz

    endif

  endif

endif

endif





ifdef NO_DEMANGLE

ifdef NO_DEMANGLE
@@ -523,15 +540,10 @@ else 
    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

  else

  else

    ifneq ($(feature-libbfd), 1)

    ifneq ($(feature-libbfd), 1)

      $(call feature_check,liberty)

      ifneq ($(feature-liberty), 1)

      ifeq ($(feature-liberty), 1)

        ifneq ($(feature-liberty-z), 1)

        EXTLIBS += -lbfd -liberty

          # we dont have neither HAVE_CPLUS_DEMANGLE_SUPPORT

      else

          # or any of 'bfd iberty z' trinity

        $(call feature_check,liberty-z)

        ifeq ($(feature-liberty-z), 1)

          EXTLIBS += -lbfd -liberty -lz

        else

          $(call feature_check,cplus-demangle)

          ifeq ($(feature-cplus-demangle), 1)

          ifeq ($(feature-cplus-demangle), 1)

            EXTLIBS += -liberty

            EXTLIBS += -liberty

            CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

            CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT