From 67fd179468a09a60ebe0f01f15ee121f3eb23e88 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Fri, 17 Nov 2023 23:06:05 +0000 Subject: [PATCH] binutils: fix gas that doesn't handle MIPS1 FPR load hazard correctly. Fixes PR/57680. Should be pulled up to netbsd-10, netbsd-9, and netbsd-8. --- external/gpl3/binutils/dist/gas/config/tc-mips.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/gpl3/binutils/dist/gas/config/tc-mips.c b/external/gpl3/binutils/dist/gas/config/tc-mips.c index 0d1e19a50b4c..2f4813776461 100644 --- a/external/gpl3/binutils/dist/gas/config/tc-mips.c +++ b/external/gpl3/binutils/dist/gas/config/tc-mips.c @@ -6509,8 +6509,8 @@ insns_between (const struct mips_cl_insn *insn1, /* Itbl support may require additional care here. FIXME! Need to modify this to include knowledge about user specified delays! */ - else if ((!cop_interlocks && (pinfo1 & INSN_COPROC_MOVE)) - || (!cop_mem_interlocks && (pinfo1 & INSN_COPROC_MEMORY_DELAY))) + if ((!cop_interlocks && (pinfo1 & INSN_COPROC_MOVE)) + || (!cop_mem_interlocks && (pinfo1 & INSN_COPROC_MEMORY_DELAY))) { /* Handle cases where INSN1 writes to a known general coprocessor register. There must be a one instruction delay before INSN2