Remove spurious conflict indicators.

[deliverable/binutils-gdb.git] / ld / emulparams / arcelf.sh

diff --git a/ld/emulparams/arcelf.sh b/ld/emulparams/arcelf.sh
index b1c9c1760cee1b5f76b03b9465ee929228229367..cd334d6232454d1bd056c8872bae7574f129b334 100644 (file)
--- a/ld/emulparams/arcelf.sh
+++ b/ld/emulparams/arcelf.sh
@@ -1,11 +1,12 @@
 SCRIPT_NAME=elf
+TEMPLATE_NAME=generic
+EXTRA_EM_FILE=genelf
 OUTPUT_FORMAT="elf32-littlearc"
 LITTLE_OUTPUT_FORMAT="elf32-littlearc"
 BIG_OUTPUT_FORMAT="elf32-bigarc"
+NO_RELA_RELOCS=yes
 TEXT_START_ADDR=0x0
-MAXPAGESIZE=0x1000
-NONPAGED_TEXT_START_ADDR=0x0
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=arc
 MACHINE=
 ENTRY=start
-#TEMPLATE_NAME=elf32