Ticket #10240: buildtools-ppc-got-workaround.diff

binutils/ld/Makefile.am

@@ -1303 +1303 @@
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
     ${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
 eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \
+  $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
+  $(srcdir)/emultempl/ppc32elf.em \
+  ldemul-list.h $(ELF_DEPS) \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
     ${GENSCRIPTS} elf_ppc_haiku "$(tdir_elf_ppc_haiku)"
 eelf_mipsel_haiku.c: $(srcdir)/emulparams/elf_mipsel_haiku.sh \

binutils/ld/Makefile.in

@@ -2780 +2780 @@
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
     ${GENSCRIPTS} elf_mipsel_haiku "$(tdir_elf_mipsel_haiku)"
 eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \
+  $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
+  $(srcdir)/emultempl/ppc32elf.em \
+  ldemul-list.h $(ELF_DEPS) \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
     ${GENSCRIPTS} elf_ppc_haiku "$(tdir_elf_ppc_haiku)"
 eelf_i386_nacl.c: $(srcdir)/emulparams/elf_i386_nacl.sh \

binutils/ld/configure.tgt

@@ -599 +599 @@
 powerpc-*-aix[5-9]*)    targ_emul=aix5ppc ;;
 powerpc-*-aix*)     targ_emul=aixppc ;;
 powerpc-*-beos*)    targ_emul=aixppc ;;
-powerpc-*-haiku*)   targ_emul=elf_ppc_haiku ;;
+powerpc-*-haiku*)   targ_emul=elf_ppc_haiku
+            targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim" ;;
 powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;;
 powerpc-*-lynxos*)  targ_emul=ppclynx ;;
 rs6000-*-aix[5-9]*) targ_emul=aix5rs6 ;;

binutils/ld/emulparams/elf_ppc_haiku.sh

@@ -1 @@
-SCRIPT_NAME=elf
-OUTPUT_FORMAT="elf32-powerpc"
+#. ${srcdir}/emulparams/elf32ppccommon.sh
+. ${srcdir}/emulparams/elf32ppc.sh
 TEXT_START_ADDR=0x200000
 NONPAGED_TEXT_START_ADDR=0x200000
 MAXPAGESIZE=0x1000
 ARCH=powerpc
-MACHINE=
 NOP=0x60000000
-TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 BSS_PLT=
-OTHER_RELRO_SECTIONS="
-  .fixup        ${RELOCATING-0} : { *(.fixup) }
-  .got1         ${RELOCATING-0} : { *(.got1) }
-  .got2         ${RELOCATING-0} : { *(.got2) }
-"
-OTHER_GOT_RELOC_SECTIONS="
-  .rela.got1         ${RELOCATING-0} : { *(.rela.got1) }
-  .rela.got2         ${RELOCATING-0} : { *(.rela.got2) }
-"
+LIBPATH_SUFFIX=