diff --git a/binutils/ld/emulparams/elf32lriscv-defs.sh b/binutils/ld/emulparams/elf32lriscv-defs.sh
index c7e17193..cc2937b2 100644
--- a/binutils/ld/emulparams/elf32lriscv-defs.sh
+++ b/binutils/ld/emulparams/elf32lriscv-defs.sh
@@ -2,6 +2,7 @@
 SCRIPT_NAME=elf
 ARCH=riscv
 OUTPUT_FORMAT="elf32-littleriscv"
+NO_REL_RELOCS=yes
 
 TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=riscvelf
@@ -26,7 +27,7 @@ GENERATE_PIE_SCRIPT=yes
 TEXT_START_ADDR=0x10000000
 SHLIB_TEXT_START_ADDR=0x1000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-ENTRY=_start
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 
 INITIAL_READONLY_SECTIONS=".interp       ${RELOCATING-0} : { *(.interp) }"
 SDATA_START_SYMBOLS="_gp = . + 0x800;
@@ -37,5 +38,3 @@ if test -n "${CREATE_SHLIB}"; then
   OTHER_READONLY_SECTIONS=".srodata      ${RELOCATING-0} : { *(.srodata.cst16) *(.srodata.cst8) *(.srodata.cst4) *(.srodata.cst2) *(.srodata*) }"
   unset GOT
 fi
-
-TEXT_DYNAMIC=
diff --git a/binutils/ld/emulparams/elf32lriscv.sh b/binutils/ld/emulparams/elf32lriscv.sh
index 11ef663c..aac08e78 100644
--- a/binutils/ld/emulparams/elf32lriscv.sh
+++ b/binutils/ld/emulparams/elf32lriscv.sh
@@ -1,9 +1,2 @@
 . ${srcdir}/emulparams/elf32lriscv-defs.sh
 OUTPUT_FORMAT="elf32-littleriscv"
-COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-
-# Magic sections.
-OTHER_SECTIONS='
-  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-'
diff --git a/binutils/ld/emulparams/elf64lriscv-defs.sh b/binutils/ld/emulparams/elf64lriscv-defs.sh
index abaf766f..fbc612eb 100644
--- a/binutils/ld/emulparams/elf64lriscv-defs.sh
+++ b/binutils/ld/emulparams/elf64lriscv-defs.sh
@@ -1,2 +1 @@
 . ${srcdir}/emulparams/elf32lriscv-defs.sh
-COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"