[linux-yocto] [PATCH 1/2] Revert "perf: temporary gcc 4.7 build fixes"

[tom.zanussi at linux.intel.com]

From: Tom Zanussi <tom.zanussi at linux.intel.com>

This has been fixed upstream, real fix to follow.

This reverts commit 100ba7b476d4b595e8c6b7eca52a32bbbfe29cb1.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 tools/lib/traceevent/Makefile | 2 +-
 tools/perf/Makefile           | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 7bb26ce..a20e320 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -122,7 +122,7 @@ export Q VERBOSE
 
 EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION)
 
-INCLUDES = -I. -I=/usr/local/include $(CONFIG_INCLUDES)
+INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
 
 # Set compile option CFLAGS if not set elsewhere
 CFLAGS ?= -g -Wall
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5ff0e3f..215a0d4 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -86,11 +86,9 @@ ifeq ($(ARCH),x86_64)
 endif
 
 # Treat warnings as errors unless directed not to
-#if 0
 ifneq ($(WERROR),0)
 	CFLAGS_WERROR := -Werror
 endif
-#endif
 
 ifeq ("$(origin DEBUG)", "command line")
   PERF_DEBUG = $(DEBUG)
-- 
1.7.11.4