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

[Daiane Angolini]

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....@freescale.com>
---
.../perf_tools_Fix_build_against_newer_glibc.patch | 37 ++++++++++++++++++++
recipes-kernel/linux/linux-imx_3.0.35.bb | 5 ++-
2 files changed, 41 insertions(+), 1 deletions(-)
create mode 100644 recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch

diff --git a/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch b/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
new file mode 100644
index 0000000..9631777
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
@@ -0,0 +1,37 @@
+From: Josh Boyer <jwb...@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 <mi...@elte.hu>
+Cc: Peter Zijlstra <a.p.zi...@chello.nl>
+Link: http://lkml.kernel.org/r/2011081811...@zod.bos.redhat.com
+Signed-off-by: Josh Boyer <jwb...@redhat.com>
+Signed-off-by: Arnaldo Carvalho de Melo <ac...@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/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index b544166..8c699f0 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/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"
+
--
1.7.5.4

[Otavio Salvador]

Applied to master.

--
1.7.5.4


--
--
OpenEmbedded/Yocto Freescale ARM BSP - meta-f...@googlegroups.com

Source code of the BSP: http://github.com/Freescale/meta-fsl-arm

To cancel your subscription in this group send an e-mail to meta-fsl-arm...@googlegroups.com
For more options go to http://groups.google.com/group/meta-fsl-arm

--
Otavio Salvador                             O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br