Remove spurious conflict indicators.

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

diff --git a/ld/emulparams/pjlelf.sh b/ld/emulparams/pjlelf.sh
index eb568105aa5e5f4f222ea29a4f8374260baf8ffe..88c2b646044c8b15231e7676543d8a84feabe1db 100644 (file)
--- a/ld/emulparams/pjlelf.sh
+++ b/ld/emulparams/pjlelf.sh
@@ -1,5 +1,2 @@
-SCRIPT_NAME=elf
+. ${srcdir}/emulparams/pjelf.sh
 OUTPUT_FORMAT="elf32-pjl"
-TEXT_START_ADDR=0x1000000
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-ARCH=pj