summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-18 15:57:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 15:27:39 +0100
commitc19d858d019ac8081dd51496cd94225b4d11e788 (patch)
treea909fabceb46636b55d69167c703a894becf084b /meta/recipes-devtools
parent3eb49d2492a20695df4219edeb26f3530ac29e9f (diff)
downloadpoky-c19d858d019ac8081dd51496cd94225b4d11e788.tar.gz
binutils: Fix build when compiling target binutils recipe with gcc 4.6
(From OE-Core rev: 43c72d44337a736fc4b83ce16f7f1ed0d74243dc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/binutils/binutils/clone-shadow.patch79
-rw-r--r--meta/recipes-devtools/binutils/binutils_2.21.1.bb3
2 files changed, 81 insertions, 1 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/clone-shadow.patch b/meta/recipes-devtools/binutils/binutils/clone-shadow.patch
new file mode 100644
index 0000000000..2939011c11
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/clone-shadow.patch
@@ -0,0 +1,79 @@
1This fixes a global shadow warning. The warning is treated as error hence breaks the build of target
2binutils.
3
4 /b/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/binutils-2.21.1-r1/binutils-2.21.1/gas/config/obj-elf.c: In function 'obj_elf_parse_section_letters':
5| /b/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/binutils-2.21.1-r1/binutils-2.21.1/gas/config/obj-elf.c:744:68: error: declaration of 'clone' shadows a global declaration [-Werror=shadow]
6| /b/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/binutils-2.21.1-r1/binutils-2.21.1/gas/config/obj-elf.c: In function 'obj_elf_section':
7| /b/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/binutils-2.21.1-r1/binutils-2.21.1/gas/config/obj-elf.c:981:16: error: declaration of 'clone' shadows a global declaration [-Werror=shadow]
8| cc1: all warnings being treated as errors
9|
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Index: binutils-2.21.1/gas/config/obj-elf.c
15===================================================================
16--- binutils-2.21.1.orig/gas/config/obj-elf.c 2011-03-23 07:14:03.000000000 -0700
17+++ binutils-2.21.1/gas/config/obj-elf.c 2011-07-16 19:05:57.003831035 -0700
18@@ -741,10 +741,10 @@
19 }
20
21 static bfd_vma
22-obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone)
23+obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *cloneit)
24 {
25 bfd_vma attr = 0;
26- *clone = FALSE;
27+ *cloneit = FALSE;
28
29 while (len > 0)
30 {
31@@ -775,7 +775,7 @@
32 attr |= SHF_TLS;
33 break;
34 case '?':
35- *clone = TRUE;
36+ *cloneit = TRUE;
37 break;
38 /* Compatibility. */
39 case 'm':
40@@ -978,7 +978,7 @@
41
42 if (*input_line_pointer == '"')
43 {
44- bfd_boolean clone;
45+ bfd_boolean cloneit;
46
47 beg = demand_copy_C_string (&dummy);
48 if (beg == NULL)
49@@ -986,7 +986,7 @@
50 ignore_rest_of_line ();
51 return;
52 }
53- attr |= obj_elf_parse_section_letters (beg, strlen (beg), &clone);
54+ attr |= obj_elf_parse_section_letters (beg, strlen (beg), &cloneit);
55
56 SKIP_WHITESPACE ();
57 if (*input_line_pointer == ',')
58@@ -1038,10 +1038,10 @@
59 attr &= ~SHF_MERGE;
60 }
61
62- if ((attr & SHF_GROUP) != 0 && clone)
63+ if ((attr & SHF_GROUP) != 0 && cloneit)
64 {
65 as_warn (_("? section flag ignored with G present"));
66- clone = FALSE;
67+ cloneit = FALSE;
68 }
69 if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',')
70 {
71@@ -1063,7 +1063,7 @@
72 attr &= ~SHF_GROUP;
73 }
74
75- if (clone)
76+ if (cloneit)
77 {
78 const char *now_group = elf_group_name (now_seg);
79 if (now_group != NULL)
diff --git a/meta/recipes-devtools/binutils/binutils_2.21.1.bb b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
index 4eb6566437..e1a16a65e2 100644
--- a/meta/recipes-devtools/binutils/binutils_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
@@ -1,6 +1,6 @@
1require binutils.inc 1require binutils.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5LIC_FILES_CHKSUM="\ 5LIC_FILES_CHKSUM="\
6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ 6 file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
@@ -29,6 +29,7 @@ SRC_URI = "\
29 file://libiberty_path_fix.patch \ 29 file://libiberty_path_fix.patch \
30 file://binutils-poison.patch \ 30 file://binutils-poison.patch \
31 file://libtool-rpath-fix.patch \ 31 file://libtool-rpath-fix.patch \
32 file://clone-shadow.patch \
32 " 33 "
33 34
34SRC_URI[md5sum] = "a22801a9cad45c85e9ff6afc10537d72" 35SRC_URI[md5sum] = "a22801a9cad45c85e9ff6afc10537d72"