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

Commit 3e6a147d authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Separate lbfd check out of NO_DEMANGLE condition 



We fail build with NO_DEMANGLE with missing -lbfd externals error.
The reason is that we now use bfd code in srcline object:
  perf tools: Implement addr2line directly using libbfd

So we need to check/add -lbfd always now.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
parent 1df9297c

tools/perf/config/Makefile

+9 −7
Original line number Original line Diff line number Diff line
@@ -470,6 +470,10 @@ else 
  endif

  endif

endif

endif





ifeq ($(feature-libbfd), 1)

  EXTLIBS += -lbfd

endif



ifdef NO_DEMANGLE

ifdef NO_DEMANGLE

  CFLAGS += -DNO_DEMANGLE

  CFLAGS += -DNO_DEMANGLE

else

else
@@ -477,9 +481,7 @@ else 
    EXTLIBS += -liberty

    EXTLIBS += -liberty

    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

  else

  else

    ifeq ($(feature-libbfd), 1)

    ifneq ($(feature-libbfd), 1)

      EXTLIBS += -lbfd

    else

      $(feature_check,liberty)

      $(feature_check,liberty)

      ifeq ($(feature-liberty), 1)

      ifeq ($(feature-liberty), 1)

        EXTLIBS += -lbfd -liberty

        EXTLIBS += -lbfd -liberty
@@ -502,6 +504,10 @@ else 
  endif

  endif

endif

endif





ifneq ($(filter -lbfd,$(EXTLIBS)),)

  CFLAGS += -DHAVE_LIBBFD_SUPPORT

endif



ifndef NO_ON_EXIT

ifndef NO_ON_EXIT

  ifeq ($(feature-on-exit), 1)

  ifeq ($(feature-on-exit), 1)

    CFLAGS += -DHAVE_ON_EXIT_SUPPORT

    CFLAGS += -DHAVE_ON_EXIT_SUPPORT
@@ -524,10 +530,6 @@ ifndef NO_LIBNUMA 
  endif

  endif

endif

endif





ifndef ($(filter -lbfd,$(EXTLIBS)),)

  CFLAGS += -DHAVE_LIBBFD_SUPPORT

endif



# Among the variables below, these:

# Among the variables below, these:

#   perfexecdir

#   perfexecdir

#   template_dir

#   template_dir