Commit 8a4fd31e authored Jul 06, 2010 by Conny Seidel Committed by Arnaldo Carvalho de Melo Jul 22, 2010

perf tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available



make version 3.80 doesn't support "else ifdef" on the same line, also it
doesn't support unindented nested constructs.

Build fails with:
Makefile:608: Extraneous text after `else' directive
Makefile:611: *** only one `else' per conditional.  Stop.

This patch fixes the build for make 3.80.

Cc: Ingo Molnar <mingo@elte.hu>,
Cc: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1278430783-17259-1-git-send-email-conny.seidel@amd.com>
Signed-off-by: Conny Seidel <conny.seidel@amd.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 70a7cb3b

tools/perf/Makefile

+21 −19

Original line number	Diff line number	Diff line
		@@ -600,7 +600,8 @@ endif

		ifdef NO_DEMANGLE
		BASIC_CFLAGS += -DNO_DEMANGLE
		else ifdef HAVE_CPLUS_DEMANGLE
		else
		ifdef HAVE_CPLUS_DEMANGLE
		EXTLIBS += -liberty
		BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE
		else
		@@ -629,6 +630,7 @@ else
		endif
		endif
		endif
		endif

		ifndef CC_LD_DYNPATH
		ifdef NO_R_TO_GCC_LINKER