From: Daiane Angolini <daiane.angolini@freescale.com>
Date: Tue, 23 Oct 2012 13:11:47 +0000 (-0500)
Subject: linux-imx (3.0.35): perf tools: Fix build against newer glibc
X-Git-Tag: 2.1~1631
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fcd0314767441d807d57a0a82f7cd3ff70336d26;p=meta-freescale.git

linux-imx (3.0.35): perf tools: Fix build against newer glibc

Upstream glibc commit 295e904 added a definition for __attribute_const__
to cdefs.h.  This causes the following error when building perf:

util/include/linux/compiler.h:8:0: error: "__attribute_const__"
redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
location of the previous definition

Wrap __attribute_const__ in #ifndef as we do for __always_inline.

Change-Id: I0d12b349826162117b7708f79b6cac14621bcb30
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
new file mode 100644
index 00000000..96317777
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
@@ -0,0 +1,37 @@
+From: Josh Boyer <jwboyer@redhat.com>
+Date: Thu, 18 Aug 2011 11:37:21 +0000 (-0400)
+Subject: perf tools: Fix build against newer glibc
+
+perf tools: Fix build against newer glibc
+
+Upstream glibc commit 295e904 added a definition for __attribute_const__
+to cdefs.h.  This causes the following error when building perf:
+
+util/include/linux/compiler.h:8:0: error: "__attribute_const__"
+redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
+location of the previous definition
+
+Wrap __attribute_const__ in #ifndef as we do for __always_inline.
+
+Cc: Ingo Molnar <mingo@elte.hu>
+Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com
+Signed-off-by: Josh Boyer <jwboyer@redhat.com>
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+
+diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
+index 791f9dd..547628e 100644
+--- a/tools/perf/util/include/linux/compiler.h
++++ b/tools/perf/util/include/linux/compiler.h
+@@ -5,7 +5,9 @@
+ #define __always_inline	inline
+ #endif
+ #define __user
++#ifndef __attribute_const__
+ #define __attribute_const__
++#endif
+ 
+ #define __used		__attribute__((__unused__))
+ 
+
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
index b5441664..8c699f09 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -3,10 +3,13 @@
 
 include linux-imx.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 COMPATIBLE_MACHINE = "(mx6)"
 
 # Revision of 12.09.01 tag
 SRCREV = "eaaf30efdc8dfeb03418bde1499a76c9903bd211"
 LOCALVERSION = "-12.09.01+yocto"
+
+SRC_URI += "file://perf_tools_Fix_build_against_newer_glibc.patch"
+