[linux-yocto] [PATCH 1/2] Revert "perf: temporary gcc 4.7 build fixes"
bruce.ashfield at windriver.com
Fri Mar 22 12:19:24 PDT 2013
On 13-03-21 05:48 PM, Tom Zanussi wrote:
> On Thu, 2013-03-21 at 16:43 -0500, tom.zanussi at linux.intel.com wrote:
>> 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)
>> # Treat warnings as errors unless directed not to
>> -#if 0
> Actually, I assume this #if 0 that the revert removes was added as part
> of the fix for the host contamination - no way for me to tell from the
> commit message.
> It built fine here, but if there was another reason for it, please let
> me know and I can leave that part in place.
It was the same fix, there was a warning generated with the includes, so
this was fixing it up.
If it causes me problems, I'll fix it locally.
Thanks Tom, I'm staging this here for a push early next week with
some other changes.
>> ifneq ($(WERROR),0)
>> CFLAGS_WERROR := -Werror
>> ifeq ("$(origin DEBUG)", "command line")
>> PERF_DEBUG = $(DEBUG)
More information about the linux-yocto