diff --git a/binutils.changes b/binutils.changes
index d31f6bb..2e3566e 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 21 09:56:08 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- riscv-no-relax.patch: RISC-V: Don't generate branch/jump relocation if
+  symbol is local when no-relax
+
 -------------------------------------------------------------------
 Mon Feb  5 16:57:05 UTC 2024 - Michael Matz <matz@suse.com>
 
diff --git a/binutils.spec b/binutils.spec
index 47f57c8..75fa346 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -154,6 +154,7 @@ Patch42:        binutils-compat-old-behaviour.diff
 Patch43:        binutils-revert-hlasm-insns.diff
 Patch44:        binutils-revert-rela.diff
 Patch60:        binutils-disable-code-arch-error.diff
+Patch61:        riscv-no-relax.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -280,6 +281,7 @@ cp ld/ldgram.y ld/ldgram.y.orig
 %patch44 -p1
 %endif
 %patch60 -p1
+%patch61 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/riscv-no-relax.patch b/riscv-no-relax.patch
new file mode 100644
index 0000000..3424563
--- /dev/null
+++ b/riscv-no-relax.patch
@@ -0,0 +1,64 @@
+From af514e5f6d1d0233a251a3ae17f7cb8d9ba8e36b Mon Sep 17 00:00:00 2001
+From: Nelson Chu <nelson@rivosinc.com>
+Date: Mon, 29 Jan 2024 21:17:41 +0800
+Subject: [PATCH] RISC-V: Don't generate branch/jump relocation if symbol is
+ local when no-relax.
+
+Refer to commit, dff565fcca8137954d6ad571ef39f6aec5c0429c.  Theoretically,
+assembler don't need to generate the pc-relative relocation and the refered
+local .L symbol when relaxation is disabled.  The above commit improved the
+pcrel_hi/pcrel_lo relocations, and this commit improves branch and jump
+relocations.
+
+Passed the gcc/binutils regressions of riscv-gnu-toolchain.
+
+gas/
+	* config/tc-riscv.c (md_apply_fix): Raise fixP->fx_done for all
+	branch and jump relocations when -mno-relax.
+---
+ gas/config/tc-riscv.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
+index a4161420128..cbead954f09 100644
+--- a/gas/config/tc-riscv.c
++++ b/gas/config/tc-riscv.c
+@@ -4390,6 +4390,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+ 	  bfd_vma target = S_GET_VALUE (fixP->fx_addsy) + *valP;
+ 	  bfd_vma delta = target - md_pcrel_from (fixP);
+ 	  bfd_putl32 (bfd_getl32 (buf) | ENCODE_JTYPE_IMM (delta), buf);
++	  if (!riscv_opts.relax && S_IS_LOCAL (fixP->fx_addsy))
++	    fixP->fx_done = 1;
+ 	}
+       break;
+ 
+@@ -4400,6 +4402,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+ 	  bfd_vma target = S_GET_VALUE (fixP->fx_addsy) + *valP;
+ 	  bfd_vma delta = target - md_pcrel_from (fixP);
+ 	  bfd_putl32 (bfd_getl32 (buf) | ENCODE_BTYPE_IMM (delta), buf);
++	  if (!riscv_opts.relax && S_IS_LOCAL (fixP->fx_addsy))
++	    fixP->fx_done = 1;
+ 	}
+       break;
+ 
+@@ -4410,6 +4414,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+ 	  bfd_vma target = S_GET_VALUE (fixP->fx_addsy) + *valP;
+ 	  bfd_vma delta = target - md_pcrel_from (fixP);
+ 	  bfd_putl16 (bfd_getl16 (buf) | ENCODE_CBTYPE_IMM (delta), buf);
++	  if (!riscv_opts.relax && S_IS_LOCAL (fixP->fx_addsy))
++	    fixP->fx_done = 1;
+ 	}
+       break;
+ 
+@@ -4420,6 +4426,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+ 	  bfd_vma target = S_GET_VALUE (fixP->fx_addsy) + *valP;
+ 	  bfd_vma delta = target - md_pcrel_from (fixP);
+ 	  bfd_putl16 (bfd_getl16 (buf) | ENCODE_CJTYPE_IMM (delta), buf);
++	  if (!riscv_opts.relax && S_IS_LOCAL (fixP->fx_addsy))
++	    fixP->fx_done = 1;
+ 	}
+       break;
+ 
+-- 
+2.43.2
+