[PATCH] perf tools: fix an error introduced by commit 93cbb398

[Runzhen Wang]

commit 0a720538e5dd3f424bfcc15c1e4af09df0becf92
and
commit 93cbb3985d5de867fb32e6e130fcfb1b5de4142b
move some contents of Makefile from perf/Makefile to
perf/config/Makefile.

However, that introduce the following error messages when compile perf:

util/unwind.c: In function âaccess_memâ:
util/unwind.c:400:50: error: âPERF_REG_SPâ undeclared (first use in this
function)
util/unwind.c:400:50: note: each undeclared identifier is reported only
once for each function it appears in
util/unwind.c: In function âunwind__get_entriesâ:
util/unwind.c:562:41: error: âPERF_REG_IPâ undeclared (first use in this
function)

That because the assignment statement of 'BASIC_CFLAGS' is behind
'BASIC_CFLAGS += -DHAVE_PERF_REGS', which will rewrite the value of
'BASIC_CFLAGS'.

Without the definition of 'HAVE_PERF_REGS', perf/util/perf_regs.h can't
include perf/arch/x86/include/perf_regs.h, that will cause the error.

The solution is to move the assignment statement of BASIC_CFLAGS ahead of
BASIC_CFLAGS += -DHAVE_PERF_REGS.

Signed-off-by: Runzhen Wang <runzhen@xxxxxxxxxxxxxxxxxx>
---
 tools/perf/config/Makefile |   33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 1f12a55..a8ec66f 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -5,6 +5,23 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
 				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
 				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
+
+BASIC_CFLAGS = \
+	-Iutil/include \
+	-Iarch/$(ARCH)/include \
+	$(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
+	-I$(srctree)/arch/$(ARCH)/include/uapi \
+	-I$(srctree)/arch/$(ARCH)/include \
+	$(if $(objtree),-I$(objtree)/include/generated/uapi) \
+	-I$(srctree)/include/uapi \
+	-I$(srctree)/include \
+	-I$(OUTPUT)util \
+	-Iutil \
+	-I. \
+	-I$(TRACE_EVENT_DIR) \
+	-I../lib/ \
+	-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
 NO_PERF_REGS := 1
 
 # Additional ARCH settings for x86
@@ -84,22 +101,6 @@ ifndef PERF_DEBUG
 	endif
 endif
 
-BASIC_CFLAGS = \
-	-Iutil/include \
-	-Iarch/$(ARCH)/include \
-	$(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
-	-I$(srctree)/arch/$(ARCH)/include/uapi \
-	-I$(srctree)/arch/$(ARCH)/include \
-	$(if $(objtree),-I$(objtree)/include/generated/uapi) \
-	-I$(srctree)/include/uapi \
-	-I$(srctree)/include \
-	-I$(OUTPUT)util \
-	-Iutil \
-	-I. \
-	-I$(TRACE_EVENT_DIR) \
-	-I../lib/ \
-	-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
 BASIC_LDFLAGS =
 
 ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/