From 57f91589c90150cbcf10daea8020f54ab5d814e6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Sep 2012 18:51:33 -0300 Subject: [PATCH] linux-imx (2.6.35.3): 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 done for __always_inline. Signed-off-by: Otavio Salvador --- ...-tools-Fix-build-against-newer-glibc.patch | 40 +++++++++++++++++++ .../linux/linux-imx_2.6.35.3.bb | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch new file mode 100644 index 00000000..b90dfda9 --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch @@ -0,0 +1,40 @@ +From ee7517dc33cd8c1d10bc504faef8a085694eebe2 Mon Sep 17 00:00:00 2001 +From: Josh Boyer +Date: Thu, 18 Aug 2011 07:37:21 -0400 +Subject: [PATCH 2/2] 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 +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com +Signed-off-by: Josh Boyer +Signed-off-by: Arnaldo Carvalho de Melo +--- + tools/perf/util/include/linux/compiler.h | 2 ++ + 1 file changed, 2 insertions(+) + +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__)) + +-- +1.7.10.4 + diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index a02a69d1..df119357 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb @@ -1,7 +1,7 @@ # Copyright (C) 2011-2012 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" include linux-imx.inc @@ -17,6 +17,7 @@ LOCALVERSION = "-11.09.01+yocto-${DATE}" SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ + file://perf-tools-Fix-build-against-newer-glibc.patch \ file://no-unaligned-access.patch \ file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \ " -- 2.40.1