diff options
author | Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com> | 2011-09-07 12:44:15 +0200 |
---|---|---|
committer | Thomas Zimmermann <zimmermann@vdm-design.de> | 2011-09-10 15:52:53 +0200 |
commit | faa5cb3e04c9c9ff8bb94c775c2e1cac35b9ec10 (patch) | |
tree | 2f624b35c1ddf22636581a962c0bc203c6a5d0db /recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch | |
parent | e4ed27cdcb0c3ae446162b888a1a0199513f6337 (diff) | |
download | openembedded-faa5cb3e04c9c9ff8bb94c775c2e1cac35b9ec10.tar.gz |
binutils: Update from 2.21 to 2.21.1a
Due to a GPL violation corrected Binutils archives were uploaded with the suffix »a« and the faulty archives were removed [1]. The URLs redirect to the new archives and therefore the checksums are now incorrect.
Use this incident to update the package also to the new version 2.21.1a. Due to this one patch had to be regenerated and was taken from OE-core [2].
This patch is build tested using `angstrom-2010.x` and `minimal{,-uclibc}` for `MACHINE = "beagleboard"`.
[1] http://nickclifton.livejournal.com/9067.html
[2] http://git.openembedded.org/cgit.cgi/openembedded-core/tree/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch?id=4810404f22d7cf8849dc32da68dd33a156cac407
Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com>
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch')
-rw-r--r-- | recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch b/recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch new file mode 100644 index 0000000000..5491e261a6 --- /dev/null +++ b/recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch @@ -0,0 +1,72 @@ +Fixes the following error for SH4 native binutils + +/scratch/oe/work/sh4-oe-linux-uclibc/binutils-git-r13.2+gitr0+6ef128735ce52ee2acf8cfd80f6d72003dd39ab7/git/gas/config/obj-elf.c:744: error: declaration of 'clone' shadows a global declaration/scratch/oe/sysroots/sh4-oe-linux-uclibc/usr/include/bits/sched.h:74: error: shadowed declaration is here/scratch/oe/work/sh4-oe-linux-uclibc/binutils-git-r13.2+gitr0+6ef128735ce52ee2acf8cfd80f6d72003dd39ab7/git/gas/config/obj-elf.c: In function 'obj_elf_section':/scratch/oe/work/sh4-oe-linux-uclibc/binutils-git-r13.2+gitr0+6ef128735ce52ee2acf8cfd80f6d72003dd39ab7/git/gas/config/obj-elf.c:981: error: declaration of 'clone' shadows a global declaration/scratch/oe/sysroots/sh4-oe-linux-uclibc/usr/include/bits/sched.h:74: error: shadowed declaration is heremake[4]: *** [obj-elf.o] Error 1 + +-Khem + +Index: git/gas/config/obj-elf.c +=================================================================== +--- git.orig/gas/config/obj-elf.c ++++ git/gas/config/obj-elf.c +@@ -741,10 +741,10 @@ obj_elf_change_section (const char *name + } + + static bfd_vma +-obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *clone) ++obj_elf_parse_section_letters (char *str, size_t len, bfd_boolean *duplicate) + { + bfd_vma attr = 0; +- *clone = FALSE; ++ *duplicate = FALSE; + + while (len > 0) + { +@@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str + attr |= SHF_TLS; + break; + case '?': +- *clone = TRUE; ++ *duplicate = TRUE; + break; + /* Compatibility. */ + case 'm': +@@ -978,7 +978,7 @@ obj_elf_section (int push) + + if (*input_line_pointer == '"') + { +- bfd_boolean clone; ++ bfd_boolean duplicate; + + beg = demand_copy_C_string (&dummy); + if (beg == NULL) +@@ -986,7 +986,7 @@ obj_elf_section (int push) + ignore_rest_of_line (); + return; + } +- attr |= obj_elf_parse_section_letters (beg, strlen (beg), &clone); ++ attr |= obj_elf_parse_section_letters (beg, strlen (beg), &duplicate); + + SKIP_WHITESPACE (); + if (*input_line_pointer == ',') +@@ -1038,10 +1038,10 @@ obj_elf_section (int push) + attr &= ~SHF_MERGE; + } + +- if ((attr & SHF_GROUP) != 0 && clone) ++ if ((attr & SHF_GROUP) != 0 && duplicate) + { + as_warn (_("? section flag ignored with G present")); +- clone = FALSE; ++ duplicate = FALSE; + } + if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',') + { +@@ -1063,7 +1063,7 @@ obj_elf_section (int push) + attr &= ~SHF_GROUP; + } + +- if (clone) ++ if (duplicate) + { + const char *now_group = elf_group_name (now_seg); + if (now_group != NULL) |