From a53244f05ed3c6d7e39d40cd04d084333ae39aa1 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 17 Sep 2019 15:41:25 -0500
Subject: system/binutils: disable further tests that rely on the failing pmmx
 ones (#196)

---
 system/binutils/APKBUILD      |  2 +-
 system/binutils/BTS-196.patch | 52 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index 490ab485e..33e6579c0 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -153,4 +153,4 @@ c0f50f1a843480f29b3895c8814df9801b9f90260edbaff1831aa5738fedd07a9e6b7a79f5b6f9be
 9109a6ff9c55f310f86a1561fe6b404534928d402672490059bbe358f77c0c2a7f73c8b67f0a4450f00ba1776452858b63fa60cf2ec0744104a6b077e8fa3e42  CVE-2019-12972.patch
 c277202272d9883741c2530a94c6d50d55dd9d0a9efaa43a1f8c9fc7529bd45e635255c0d90035dfc5920d5387010a4259612a4d711260a95d7b3d9fa6500e4f  CVE-2019-14250.patch
 d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110  BTS-170.patch
-dec581f7314f893f927acdaeb4436f5576a69418aaac3edd374a0efc473aeedda419f10e193adb59e02d37d03f576bf383821ec560d7aa21c1e4aec24e868375  BTS-196.patch"
+9cc17d9fe3fc1351d1f6b4fc1c916254529f3304c95db6f4698b867eeb623210b914dc798fb837eafbad2b287b78b31c4ed5482b3151a2992864da04e1dd5fac  BTS-196.patch"
diff --git a/system/binutils/BTS-196.patch b/system/binutils/BTS-196.patch
index a49bd3ed2..08316d279 100644
--- a/system/binutils/BTS-196.patch
+++ b/system/binutils/BTS-196.patch
@@ -155,7 +155,57 @@ https://bts.adelielinux.org/show_bug.cgi?id=196
  ]
  
  run_ld_link_exec_tests [list \
-@@ -239,15 +167,6 @@ run_ld_link_exec_tests [list \
+@@ -168,24 +96,6 @@ run_ld_link_exec_tests [list \
+ 	"pass.out" \
+     ] \
+     [list \
+-	"No PLT (dynamic 1b)" \
+-	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1b" \
+-	"pass.out" \
+-    ] \
+-    [list \
+-	"No PLT (dynamic 1c)" \
+-	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1c" \
+-	"pass.out" \
+-    ] \
+-    [list \
+ 	"No PLT (static 1d)" \
+ 	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+@@ -204,24 +114,6 @@ run_ld_link_exec_tests [list \
+ 	"pass.out" \
+     ] \
+     [list \
+-	"No PLT (PIE 1f)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1f" \
+-	"pass.out" \
+-    ] \
+-    [list \
+-	"No PLT (PIE 1g)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1g" \
+-	"pass.out" \
+-    ] \
+-    [list \
+ 	"No PLT (dynamic 1h)" \
+ 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
+@@ -239,15 +131,6 @@ run_ld_link_exec_tests [list \
  	"no-plt-1i" \
  	"pass.out" \
      ] \
-- 
cgit v1.2.3-60-g2f50