Re: [dylan][PATCH 2/2] binutils: backport patch to fix build with gcc-4.9

[Martin Jansa <martin.jansa@gmail.com>]

On Fri, Apr 10, 2015 at 01:34:29PM +0200, Martin Jansa wrote:
> * backported from 2.23.2, fixes:
> work/x86_64-linux/binutils-native/2.23.1-r3/binutils-2.23.1/gas/write.c:409:24:
>   error: 'dummy.fr_type' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>    gas_assert (prev_frag->fr_type != 0);
>                         ^
> work/x86_64-linux/binutils-native/2.23.1-r3/binutils-2.23.1/gas/write.c:392:9: note: 'dummy' was declared here
>    fragS dummy, *prev_frag = &dummy;
>          ^

Ping

1/2 patch was merged almost immediately, but it isn't any good without
this 2/2.

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-devtools/binutils/binutils-2.23.1.inc |  1 +
>  ...in_frchains_together_1-Reorder-assertion-.patch | 30 ++++++++++++++++++++++
>  2 files changed, 31 insertions(+)
>  create mode 100644 meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch
> 
> diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc
> index 7b3366a..6a6811b 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 = "\
>       file://binutils-fix-over-array-bounds-issue.patch \
>       file://replace_macros_with_static_inline.patch \
>       file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \
> +     file://0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch \
>       "
>  
>  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 0000000..ffe6852
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils/0001-write.c-chain_frchains_together_1-Reorder-assertion-.patch
> @@ -0,0 +1,30 @@
> +From c50d883cb61ff9917464cb695a0fd83fdb0f9c20 Mon Sep 17 00:00:00 2001
> +From: Alan Modra <amodra@bigpond.net.au>
> +Date: Mon, 21 Jan 2013 13:48:31 +0000
> +Subject: [PATCH] write.c (chain_frchains_together_1): Reorder assertion to
> + avoid uninit warning.
> +
> +Upstream-Status: Backport from 2.23.2
> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> +---
> + gas/write.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/gas/write.c b/gas/write.c
> +index a467147..56ebb6c 100644
> +--- a/gas/write.c
> ++++ b/gas/write.c
> +@@ -406,8 +406,8 @@ chain_frchains_together_1 (segT section, struct frchain *frchp)
> + 	  prev_fix = frchp->fix_tail;
> + 	}
> +     }
> +-  gas_assert (prev_frag->fr_type != 0);
> +-  gas_assert (prev_frag != &dummy);
> ++  gas_assert (prev_frag != &dummy
> ++	      && prev_frag->fr_type != 0);
> +   prev_frag->fr_next = 0;
> +   return prev_frag;
> + }
> +-- 
> +2.3.5
> +
> -- 
> 2.3.5
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com