diff options
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.23.1.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc index 7b3366aeac..6a6811b87d 100644 --- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc | |||
@@ -31,6 +31,7 @@ SRC_URI = "\ | |||
31 | file://binutils-fix-over-array-bounds-issue.patch \ | 31 | file://binutils-fix-over-array-bounds-issue.patch \ |
32 | file://replace_macros_with_static_inline.patch \ | 32 | file://replace_macros_with_static_inline.patch \ |
33 | file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \ | 33 | file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \ |
34 | file://0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch \ | ||
34 | " | 35 | " |
35 | 36 | ||
36 | BACKPORT = "\ | 37 | BACKPORT = "\ |
diff --git a/meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch b/meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch new file mode 100644 index 0000000000..ffe6852dff --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From c50d883cb61ff9917464cb695a0fd83fdb0f9c20 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@bigpond.net.au> | ||
3 | Date: Mon, 21 Jan 2013 13:48:31 +0000 | ||
4 | Subject: [PATCH] write.c (chain_frchains_together_1): Reorder assertion to | ||
5 | avoid uninit warning. | ||
6 | |||
7 | Upstream-Status: Backport from 2.23.2 | ||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | gas/write.c | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/gas/write.c b/gas/write.c | ||
14 | index a467147..56ebb6c 100644 | ||
15 | --- a/gas/write.c | ||
16 | +++ b/gas/write.c | ||
17 | @@ -406,8 +406,8 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) | ||
18 | prev_fix = frchp->fix_tail; | ||
19 | } | ||
20 | } | ||
21 | - gas_assert (prev_frag->fr_type != 0); | ||
22 | - gas_assert (prev_frag != &dummy); | ||
23 | + gas_assert (prev_frag != &dummy | ||
24 | + && prev_frag->fr_type != 0); | ||
25 | prev_frag->fr_next = 0; | ||
26 | return prev_frag; | ||
27 | } | ||
28 | -- | ||
29 | 2.3.5 | ||
30 | |||