[arch-commits] Commit in binutils/trunk (PKGBUILD binutils-2.24-lto-testsuite.patch)

[Allan McRae]

    Date: Wednesday, April 23, 2014 @ 04:14:53
  Author: allan
Revision: 211669

upgpkg: binutils 2.24-3

gcc-4.9 toolchain build, apply patch for all but one LTO testsuite failure with gcc-4.9

Added:
  binutils/trunk/binutils-2.24-lto-testsuite.patch
Modified:
  binutils/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   11 +++++--
 binutils-2.24-lto-testsuite.patch |   53 ++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-23 02:10:58 UTC (rev 211668)
+++ PKGBUILD	2014-04-23 02:14:53 UTC (rev 211669)
@@ -5,7 +5,7 @@
 
 pkgname=binutils
 pkgver=2.24
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils/"
@@ -17,9 +17,11 @@
 replaces=('binutils-multilib')
 options=('staticlibs' '!distcc' '!ccache')
 install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
+        binutils-2.24-lto-testsuite.patch)
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
-         'SKIP')
+         'SKIP'
+         'b16e895c24ff80acd98a21021eccefad')
 
 prepare() {
   cd ${srcdir}/binutils-${pkgver}
@@ -27,6 +29,9 @@
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
+  # fix lto testsuite with gcc-4.9 - commit b35d44f1
+  patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
+
   mkdir ${srcdir}/binutils-build
 }
 

Added: binutils-2.24-lto-testsuite.patch
===================================================================
--- binutils-2.24-lto-testsuite.patch	                        (rev 0)
+++ binutils-2.24-lto-testsuite.patch	2014-04-23 02:14:53 UTC (rev 211669)
@@ -0,0 +1,53 @@
+index c5249f0..69946de 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -57,7 +57,7 @@ set lto_link_tests {
+    "" "-O2"
+    {lto-3c.c} {} "libdummy.a"}
+   {"Build liblto-3.a"
+-   "" "-flto"
++   "" "-flto -ffat-lto-objects"
+    {lto-3b.c} {} "liblto-3.a"}
+   {"Build libdummy.a 5a"
+    "" "-flto"
+@@ -111,7 +111,7 @@ set lto_link_tests {
+    "" ""
+    {pr12758a.s} {} "libdummy.a"}
+   {"Build libpr12758.a"
+-   "" "-flto -O2"
++   "" "-flto -O2 -ffat-lto-objects"
+    {pr12758b.c} {} "libpr12758.a"}
+   {"PR ld/12758"
+    "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" ""
+@@ -120,13 +120,13 @@ set lto_link_tests {
+    "" ""
+    {pr12760a.c} {} "libdummy.a"}
+   {"Build libpr12760.a"
+-   "" "-flto -O2"
++   "" "-flto -O2 -ffat-lto-objects"
+    {pr12760b.c} {} "libpr12760.a"}
+   {"PR ld/12760"
+    "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" ""
+    {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"}
+   {"Build libpr13183.a"
+-   "-T" "-flto -O2"
++   "-T" "-flto -O2 -ffat-lto-objects"
+    {pr13183a.c} {} "libpr13183.a"}
+   {"Build libdummy.a PR ld/13183"
+    "" "-flto -O2"
+diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
+index 8df42ae..175449a 100644
+--- a/ld/testsuite/lib/ld-lib.exp
++++ b/ld/testsuite/lib/ld-lib.exp
+@@ -1643,7 +1643,7 @@ proc check_lto_available { } {
+ 	set f [open $src "w"]
+ 	puts $f ""
+ 	close $f
+-	set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"]
++	set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"]
+ 	if { [lindex $status 0] == 0 } {
+ 	    set lto_available_saved 1
+ 	} else {
+-- 
+1.7.1
+