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

[Allan McRae]

    Date: Tuesday, July 8, 2014 @ 07:36:25
  Author: allan
Revision: 216628

fix last testsuite issue

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

-----------------------------------+
 PKGBUILD                          |    7 +++----
 binutils-2.24-lto-testsuite.patch |   29 +++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-08 05:35:17 UTC (rev 216627)
+++ PKGBUILD	2014-07-08 05:36:25 UTC (rev 216628)
@@ -22,7 +22,7 @@
         binutils-2.24-shared-pie.patch)
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
          'SKIP'
-         'b16e895c24ff80acd98a21021eccefad'
+         'e68a1f221545f082baa5bd417cd077af'
          'ec59461c4febab9cfe1c1ef33326bc50')
 validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
 
@@ -32,7 +32,7 @@
   # 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
+  # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44
   patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
 
   # fix issues with -static -fPIE -pie - commit 4199e3b8
@@ -61,8 +61,7 @@
   cd ${srcdir}/binutils-build
   
   # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
+  make LDFLAGS="" check
 }
 
 package() {

Modified: binutils-2.24-lto-testsuite.patch
===================================================================
--- binutils-2.24-lto-testsuite.patch	2014-07-08 05:35:17 UTC (rev 216627)
+++ binutils-2.24-lto-testsuite.patch	2014-07-08 05:36:25 UTC (rev 216628)
@@ -48,6 +48,31 @@
  	if { [lindex $status 0] == 0 } {
  	    set lto_available_saved 1
  	} else {
--- 
-1.7.1
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index b14f13c..765d85f 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -324,7 +324,20 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+ 
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+-set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
++set plugin_names {
++    liblto_plugin.so
++    liblto_plugin-0.dll
++    cyglto_plugin-0.dll
++}
++set plug_opt ""
++foreach plug $plugin_names {
++    set plug_so [run_host_cmd $CC "--print-prog-name $plug"]
++    if { $plug_so ne $plug } then {
++	set plug_opt "--plugin $plug_so"
++	break
++    }
++}
++set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+ if {![string match "" $catch_output]} {
+     unresolved $testname
+     restore_notify
 
+