p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Jiri 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>
This commit is contained in:
Jiri Olsa 2013-10-10 22:24:00 +02:00 committed by Arnaldo Carvalho de Melo
parent 1df9297c85
commit 3e6a147dee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/perf/config/Makefile
View File

@ -470,6 +470,10 @@ else
endif
endif
ifeq ($(feature-libbfd), 1)
EXTLIBS += -lbfd
endif
ifdef NO_DEMANGLE
CFLAGS += -DNO_DEMANGLE
else
@ -477,9 +481,7 @@ else
EXTLIBS += -liberty
CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT
else
ifeq ($(feature-libbfd), 1)
EXTLIBS += -lbfd
else
ifneq ($(feature-libbfd), 1)
$(feature_check,liberty)
ifeq ($(feature-liberty), 1)
EXTLIBS += -lbfd -liberty
@ -502,6 +504,10 @@ else
endif
endif
ifneq ($(filter -lbfd,$(EXTLIBS)),)
CFLAGS += -DHAVE_LIBBFD_SUPPORT
endif
ifndef NO_ON_EXIT
ifeq ($(feature-on-exit), 1)
CFLAGS += -DHAVE_ON_EXIT_SUPPORT
@ -524,10 +530,6 @@ ifndef NO_LIBNUMA
endif
endif
ifndef ($(filter -lbfd,$(EXTLIBS)),)
CFLAGS += -DHAVE_LIBBFD_SUPPORT
endif
# Among the variables below, these:
# perfexecdir
# template_dir