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

perf tools: Move libbfd check config into config/Makefile 



Moving libbfd check config into config/Makefile.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@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: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-14-git-send-email-jolsa@redhat.com


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

tools/perf/Makefile

+0 −37
Original line number Diff line number Diff line
@@ -538,43 +538,6 @@ ifndef NO_LIBPYTHON 
	LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o

endif



ifdef NO_DEMANGLE

	BASIC_CFLAGS += -DNO_DEMANGLE

else

	ifdef HAVE_CPLUS_DEMANGLE

		EXTLIBS += -liberty

		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),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),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),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),demangle)

					ifeq ($(has_cplus_demangle),y)

						EXTLIBS += -liberty

						BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

					else

						msg := $(warning No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demangling)

						BASIC_CFLAGS += -DNO_DEMANGLE

					endif

				endif

			endif

		endif

	endif

endif



ifeq ($(NO_PERF_REGS),0)

	ifeq ($(ARCH),x86)

		LIB_H += arch/x86/include/perf_regs.h

tools/perf/config/Makefile

+37 −0
Original line number Diff line number Diff line
@@ -324,3 +324,40 @@ else 
    endif

  endif

endif



ifdef NO_DEMANGLE

	BASIC_CFLAGS += -DNO_DEMANGLE

else

	ifdef HAVE_CPLUS_DEMANGLE

		EXTLIBS += -liberty

		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),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),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),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),demangle)

					ifeq ($(has_cplus_demangle),y)

						EXTLIBS += -liberty

						BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

					else

						msg := $(warning No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demangling)

						BASIC_CFLAGS += -DNO_DEMANGLE

					endif

				endif

			endif

		endif

	endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE