[Buildroot] [PATCH 1/2] toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405

[Buildroot] [PATCH 1/2] toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405

[Romain Naour]

Fixes:
http://autobuild.buildroot.net/results/ee562524c5b12191e584ceae89006c5a5103e700

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/grantlee/Config.in             | 1 +
 package/opencv/Config.in               | 1 +
 package/opencv3/Config.in              | 1 +
 package/pinentry/Config.in             | 1 +
 package/poppler/Config.in              | 1 +
 package/qt/Config.in                   | 7 +++++++
 toolchain/toolchain-common.in          | 3 +++
 toolchain/toolchain-external/Config.in | 1 +
 8 files changed, 16 insertions(+)

diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
index 01ddacd..3d8f3cf 100644
--- a/package/grantlee/Config.in
+++ b/package/grantlee/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANTLEE
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script
 	depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
 		(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5)
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 8bc6c34..50b381d 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -210,6 +210,7 @@ config BR2_PACKAGE_OPENCV_WITH_QT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # qt
 	depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 3a185d6..d9733d9 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -84,6 +84,7 @@ comment "gtk3 support needs libgtk3"
 config BR2_PACKAGE_OPENCV3_WITH_QT
 	bool "qt4"
 	depends on BR2_PACKAGE_QT
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_TEST
diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index f5a8159..35c6703 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -40,6 +40,7 @@ config BR2_PACKAGE_PINENTRY_QT4
 	depends on BR2_USE_MMU # fork
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index fa4ce22..990ef74 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in
@@ -15,6 +15,7 @@ if BR2_PACKAGE_POPPLER
 config BR2_PACKAGE_POPPLER_QT
 	bool "Qt support"
 	depends on BR2_PACKAGE_QT
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_XML
 	help
diff --git a/package/qt/Config.in b/package/qt/Config.in
index bf14724..96e7647 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -33,6 +33,7 @@ comment "Qt standard (X11) not available (need X.org)"
 config BR2_PACKAGE_QT_X11
 	bool "Qt standard (X11)"
 	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBX11
@@ -56,6 +57,7 @@ config BR2_PACKAGE_QT_DEBUG
 
 config BR2_PACKAGE_QT_DEMOS
 	bool "Compile and install Qt demos (with code)"
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  If unsure, say N.
@@ -69,6 +71,7 @@ config BR2_PACKAGE_QT_TRANSLATION_FILES
 
 config BR2_PACKAGE_QT_EXAMPLES
 	bool "Compile and install Qt examples (with code)"
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  If unsure, say N.
@@ -130,12 +133,16 @@ config BR2_PACKAGE_QT_QT3SUPPORT
 
 config BR2_PACKAGE_QT_GUI_MODULE
 	bool "Gui Module"
+	depends on !BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # nios2 Binutils 2.25.1 bug
 	select BR2_PACKAGE_QT_NETWORK
 	default y
 	help
 	  Turns on support for Gui applications. If your board doesn't have
 	  video output, or you don't require Qt GUI, say n.
 
+comment "Qt Gui Module needs a toolchain not affected by Binutils bug 19405"
+	depends on BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405
+
 if BR2_PACKAGE_QT_GUI_MODULE
 
 if BR2_PACKAGE_QT_EMBEDDED
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 1b7b416..6eb1e50 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -5,6 +5,9 @@
 # so put it here instead
 source "package/gdb/Config.in.host"
 
+config BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405
+	bool
+
 config BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	bool
 
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 7ba3929..81e1313 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -374,6 +374,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+	select BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 # based-on binutils-2.25.1
 	help
 	  Sourcery CodeBench toolchain for the Nios-II architecture,
 	  from Mentor Graphics. It uses gcc 5.2, binutils 2.25.51,
-- 
2.4.3

[Buildroot] [PATCH 2/2] package/binutils-2.25.1: backport upstream patch for PR19405

[Romain Naour]

Fixes Buildroot generated toolchains:
http://autobuild.buildroot.net/results/89b/89b46f97e2736d9337f888c761259e7bc7cdd128

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 ...ertion-in-NIOS2-linker-to-allow-signed-16.patch | 70 ++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch

diff --git a/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch b/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch
new file mode 100644
index 0000000..6ae9d9a
--- /dev/null
+++ b/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch
@@ -0,0 +1,70 @@
+From d07f38875f37f4608e8ecb761619d84716896f14 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Wed, 10 Feb 2016 11:25:59 +0000
+Subject: [PATCH] Correct assertion in NIOS2 linker to allow signed 16-buit
+ immediate values.
+
+	PR 19405
+	* elf32-nios2.c (nios2_elf32_install_imm16): Allow for signed
+	immediate values.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Limit the
+	number of messages about FDE encoding preventing .eh_frame_hdr
+	generation.
+
+[Romain: rebase on 2.25.1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ bfd/elf-eh-frame.c | 18 +++++++++++++++---
+ bfd/elf32-nios2.c  |  2 +-
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
+index 002932d..22430f9 100644
+--- a/bfd/elf-eh-frame.c
++++ b/bfd/elf-eh-frame.c
+@@ -1181,14 +1181,26 @@ _bfd_elf_discard_section_eh_frame
+ 		     && ent->make_relative == 0)
+ 		    || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned))
+ 	      {
++		static int num_warnings_issued = 0;
++
+ 		/* If a shared library uses absolute pointers
+ 		   which we cannot turn into PC relative,
+ 		   don't create the binary search table,
+ 		   since it is affected by runtime relocations.  */
+ 		hdr_info->table = FALSE;
+-		(*info->callbacks->einfo)
+-		  (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
+-		     " table being created.\n"), abfd, sec);
++		if (num_warnings_issued < 10)
++		  {
++		    (*info->callbacks->einfo)
++		      (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
++			 " table being created.\n"), abfd, sec);
++		    num_warnings_issued ++;
++		  }
++		else if (num_warnings_issued == 10)
++		  {
++		    (*info->callbacks->einfo)
++		      (_("%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation dropped.\n"));
++		    num_warnings_issued ++;
++		  }
+ 	      }
+ 	    ent->removed = 0;
+ 	    hdr_info->fde_count++;
+diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
+index 0105b70..726647d 100644
+--- a/bfd/elf32-nios2.c
++++ b/bfd/elf32-nios2.c
+@@ -1035,7 +1035,7 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value)
+ {
+   bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset);
+ 
+-  BFD_ASSERT(value <= 0xffff);
++  BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff);
+ 
+   bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6),
+ 	      sec->contents + offset);
+-- 
+2.4.3
+
-- 
2.4.3

[Buildroot] [PATCH 1/2] toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/ee562524c5b12191e584ceae89006c5a5103e700

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > ---
 >  package/grantlee/Config.in             | 1 +
 >  package/opencv/Config.in               | 1 +
 >  package/opencv3/Config.in              | 1 +
 >  package/pinentry/Config.in             | 1 +
 >  package/poppler/Config.in              | 1 +
 >  package/qt/Config.in                   | 7 +++++++

Hmm, why are we only adding a comment to qt and not all these other
packages?

It would be good to add a link to the upstream bugtracker in the commit
description / where the kconfig symbol is added.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] package/binutils-2.25.1: backport upstream patch for PR19405

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > Fixes Buildroot generated toolchains:
 > http://autobuild.buildroot.net/results/89b/89b46f97e2736d9337f888c761259e7bc7cdd128

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405

[Romain Naour]

Hi Peter,

Le 17/02/2016 22:26, Peter Korsgaard a ?crit :

>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
>   > Fixes:
>   > http://autobuild.buildroot.net/results/ee562524c5b12191e584ceae89006c5a5103e700
>
>   > Signed-off-by: Romain Naour <romain.naour@gmail.com>
>   > ---
>   >  package/grantlee/Config.in             | 1 +
>   >  package/opencv/Config.in               | 1 +
>   >  package/opencv3/Config.in              | 1 +
>   >  package/pinentry/Config.in             | 1 +
>   >  package/poppler/Config.in              | 1 +
>   >  package/qt/Config.in                   | 7 +++++++
>
> Hmm, why are we only adding a comment to qt and not all these other
> packages?

I wasn't sure if we want to add a comment for a toolchain bug.
Hopefully the list of packages affected by this bug is not so long.

>
> It would be good to add a link to the upstream bugtracker in the commit
> description / where the kconfig symbol is added.

See, v2 http://patchwork.ozlabs.org/patch/585613/
Sorry, I forgot to add v2 in the tittle :-/

Best regards,
Romain

>
>