4 files changed, 5 insertions, 37 deletions
diff --git a/gnu/usr.bin/binutils/ld/Makefile.am b/gnu/usr.bin/binutils/ld/Makefile.am
index 19590adc7b3..7b75c791c3a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.am
+++ b/gnu/usr.bin/binutils/ld/Makefile.am
@@ -563,7 +563,7 @@ ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
 	${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
 ehppaobsd.c: $(srcdir)/emulparams/hppaobsd.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/hppaelf.em \
-  $(srcdir)/scripttempl/hppaobsd.sc ${GEN_DEPENDS}
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} hppaobsd "$(tdir_hppaobsd)"
 ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.in b/gnu/usr.bin/binutils/ld/Makefile.in
index fc5bd673ae2..b6c00a4f76d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.in
+++ b/gnu/usr.bin/binutils/ld/Makefile.in
@@ -1093,7 +1093,7 @@ ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
 	${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
 ehppaobsd.c: $(srcdir)/emulparams/hppaobsd.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/hppaelf.em \
-  $(srcdir)/scripttempl/hppaobsd.sc ${GEN_DEPENDS}
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} hppaobsd "$(tdir_hppaobsd)"
 ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
diff --git a/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh b/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh
index 63a4567a991..331bd10f3e7 100644
--- a/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh
+++ b/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh
@@ -14,3 +14,6 @@ DATA_PLT=
 GENERATE_SHLIB_SCRIPT=yes
 TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=hppaelf
+PAD_RO=
+PAD_GOT=
+PAD_PLT=
diff --git a/gnu/usr.bin/binutils/ld/scripttempl/hppaobsd.sc b/gnu/usr.bin/binutils/ld/scripttempl/hppaobsd.sc
deleted file mode 100644
index ee525c4cc0e..00000000000
--- a/gnu/usr.bin/binutils/ld/scripttempl/hppaobsd.sc
+++ /dev/null
@@ -1,35 +0,0 @@
-test "$LD_FLAG" = "N" && DATA_ADDR=.
-cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-ENTRY("\$START\$")
-${RELOCATING+${LIB_SEARCH_DIRS}}
-SECTIONS
-{
-  .text 0x1000 ${RELOCATING++${TEXT_START_ADDR}}:
-  {
-    ${RELOCATING+__text_start = .};
-    CREATE_OBJECT_SYMBOLS
-    *(.PARISC.stubs)
-    *(.text)
-    ${RELOCATING+etext = .};
-    ${RELOCATING+_etext = .};
-  }
-  .data :
-  {
-    ${RELOCATING+ . = ALIGN(0x1000) };
-    ${RELOCATING+__data_start = .};
-    *(.data)
-    ${CONSTRUCTING+CONSTRUCTORS}
-    ${RELOCATING+edata = .};
-    ${RELOCATING+_edata = .};
-  }
-  .bss :
-  {
-   *(.bss)
-   *(COMMON)
-   ${RELOCATING+end = . };
-   ${RELOCATING+_end = . };
-  }
-}
-EOF