diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-07 18:51:33 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-11 15:24:03 -0300 |
commit | 961b6eb9d8638b26242348c6a5bdc8dc52e9e8ab (patch) | |
tree | 1a2a8bc905683af14b57894b7606b411a0305c93 | |
parent | e7f3146191b4a5c4e160ae1b585ec4fd8f99e6b0 (diff) | |
download | meta-fsl-arm-961b6eb9d8638b26242348c6a5bdc8dc52e9e8ab.tar.gz |
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 <otavio@ossystems.com.br>
-rw-r--r-- | recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch | 40 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx_2.6.35.3.bb | 3 |
2 files changed, 42 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch new file mode 100644 index 0000000..b90dfda --- /dev/null +++ b/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Fix-build-against-newer-glibc.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From ee7517dc33cd8c1d10bc504faef8a085694eebe2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Josh Boyer <jwboyer@redhat.com> | ||
3 | Date: Thu, 18 Aug 2011 07:37:21 -0400 | ||
4 | Subject: [PATCH 2/2] perf tools: Fix build against newer glibc | ||
5 | |||
6 | Upstream glibc commit 295e904 added a definition for __attribute_const__ | ||
7 | to cdefs.h. This causes the following error when building perf: | ||
8 | |||
9 | util/include/linux/compiler.h:8:0: error: "__attribute_const__" | ||
10 | redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the | ||
11 | location of the previous definition | ||
12 | |||
13 | Wrap __attribute_const__ in #ifndef as we do for __always_inline. | ||
14 | |||
15 | Cc: Ingo Molnar <mingo@elte.hu> | ||
16 | Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> | ||
17 | Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com | ||
18 | Signed-off-by: Josh Boyer <jwboyer@redhat.com> | ||
19 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
20 | --- | ||
21 | tools/perf/util/include/linux/compiler.h | 2 ++ | ||
22 | 1 file changed, 2 insertions(+) | ||
23 | |||
24 | diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h | ||
25 | index 791f9dd..547628e 100644 | ||
26 | --- a/tools/perf/util/include/linux/compiler.h | ||
27 | +++ b/tools/perf/util/include/linux/compiler.h | ||
28 | @@ -5,7 +5,9 @@ | ||
29 | #define __always_inline inline | ||
30 | #endif | ||
31 | #define __user | ||
32 | +#ifndef __attribute_const__ | ||
33 | #define __attribute_const__ | ||
34 | +#endif | ||
35 | |||
36 | #define __used __attribute__((__unused__)) | ||
37 | |||
38 | -- | ||
39 | 1.7.10.4 | ||
40 | |||
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb index a02a69d..df11935 100644 --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | # Copyright (C) 2011-2012 Freescale Semiconductor | 1 | # Copyright (C) 2011-2012 Freescale Semiconductor |
2 | # Released under the MIT license (see COPYING.MIT for the terms) | 2 | # Released under the MIT license (see COPYING.MIT for the terms) |
3 | 3 | ||
4 | PR = "${INC_PR}.5" | 4 | PR = "${INC_PR}.6" |
5 | 5 | ||
6 | include linux-imx.inc | 6 | include linux-imx.inc |
7 | 7 | ||
@@ -17,6 +17,7 @@ LOCALVERSION = "-11.09.01+yocto-${DATE}" | |||
17 | 17 | ||
18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ | 18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ |
19 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ | 19 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ |
20 | file://perf-tools-Fix-build-against-newer-glibc.patch \ | ||
20 | file://no-unaligned-access.patch \ | 21 | file://no-unaligned-access.patch \ |
21 | file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \ | 22 | file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \ |
22 | " | 23 | " |