From 43bdd7fc19b68eb38ccb88daceb36ca5d43c3139 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 2 Mar 2016 00:47:54 +0000 Subject: [PATCH] fix binutils patching regression that stopped the build commit 23d6f66966520477ba6dd04db38b7fe65ed87969 introduced this regression as a failure to backport part of the gas testsuite diff from binutils master to 2.25.1 where the file being patched had a trivial difference. I'm not sure how this went unnoticed at the time it was committed. --- patches/binutils-2.25.1/0002-cas.diff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patches/binutils-2.25.1/0002-cas.diff b/patches/binutils-2.25.1/0002-cas.diff index fc18e65..3db1743 100644 --- a/patches/binutils-2.25.1/0002-cas.diff +++ b/patches/binutils-2.25.1/0002-cas.diff @@ -135,10 +135,9 @@ diff --git a/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s b/gas/testsuite index cc29889..a3e18b5 100644 --- a/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s +++ b/gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s -@@ -12,8 +12,6 @@ +@@ -12,7 +12,5 @@ sh2a_nofpu_or_sh3_nommu: ! Instructions introduced into sh2a-nofpu-or-sh3-nommu - pref @r4 ;!/* 0000nnnn10000011 pref @ */{"pref",{A_IND_N},{HEX_0,REG_N,HEX_8,HEX_3}, arch_sh2a_nofpu_or_sh3_nommu_up} - shad r5,r4 ;!/* 0100nnnnmmmm1100 shad ,*/{"shad",{ A_REG_M,A_REG_N},{HEX_4,REG_N,REG_M,HEX_C}, arch_sh2a_nofpu_or_sh3_nommu_up} - shld r5,r4 ;!/* 0100nnnnmmmm1101 shld ,*/{"shld",{ A_REG_M,A_REG_N},{HEX_4,REG_N,REG_M,HEX_D}, arch_sh2a_nofpu_or_sh3_nommu_up}