Merge commit 'upstream/2.20'

[msp430-binutils.git] / ld / emulparams / m68kelf.sh

diff --git a/ld/emulparams/m68kelf.sh b/ld/emulparams/m68kelf.sh
index 3cda61fc05ed7da4defab1d92f899d2cdcddff0b..5c5e672dfc06ad5cdaf7e89779b524c50878ca97 100644 (file)
--- a/ld/emulparams/m68kelf.sh
+++ b/ld/emulparams/m68kelf.sh
@@ -1,11 +1,14 @@
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-m68k"
+NO_REL_RELOCS=yes
 TEXT_START_ADDR=0x80000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH=m68k
 MACHINE=
-NOP=0x4e754e75
+NOP=0x4e714e71
 TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=m68kelf
 GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes