diff --git a/binutils/ld/Makefile.am b/binutils/ld/Makefile.am index 2877c39806..d80fbf8d40 100644 --- a/binutils/ld/Makefile.am +++ b/binutils/ld/Makefile.am @@ -254,6 +254,7 @@ ALL_EMULATION_SOURCES = \ eelf32or1k_linux.c \ eelf32ppc.c \ eelf32ppc_fbsd.c \ + eelf32ppchaiku.c \ eelf32ppclinux.c \ eelf32ppcnto.c \ eelf32ppcsim.c \ @@ -279,7 +280,6 @@ ALL_EMULATION_SOURCES = \ eelf_i386_nacl.c \ eelf_i386_sol2.c \ eelf_i386_vxworks.c \ - eelf_ppc_haiku.c \ eelf_mipsel_haiku.c \ eelf_s390.c \ egld960.c \ @@ -1192,7 +1192,7 @@ eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \ ldemul-list.h \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \ +eelf32ppchaiku.c: $(srcdir)/emulparams/elf32ppchaiku.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \ diff --git a/binutils/ld/Makefile.in b/binutils/ld/Makefile.in index 44d6f52330..5dc5c021fd 100644 --- a/binutils/ld/Makefile.in +++ b/binutils/ld/Makefile.in @@ -562,6 +562,7 @@ ALL_EMULATION_SOURCES = \ eelf32or1k_linux.c \ eelf32ppc.c \ eelf32ppc_fbsd.c \ + eelf32ppchaiku.c \ eelf32ppclinux.c \ eelf32ppcnto.c \ eelf32ppcsim.c \ @@ -587,7 +588,6 @@ ALL_EMULATION_SOURCES = \ eelf_i386_nacl.c \ eelf_i386_sol2.c \ eelf_i386_vxworks.c \ - eelf_ppc_haiku.c \ eelf_mipsel_haiku.c \ eelf_s390.c \ egld960.c \ @@ -2633,7 +2633,7 @@ eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \ ldemul-list.h \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \ +eelf32ppchaiku.c: $(srcdir)/emulparams/elf32ppchaiku.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \ diff --git a/binutils/ld/configure.tgt b/binutils/ld/configure.tgt index dccb3d821f..94cf5c45e9 100644 --- a/binutils/ld/configure.tgt +++ b/binutils/ld/configure.tgt @@ -611,7 +611,7 @@ powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*) 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=elf32ppchaiku ;; powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;; powerpc-*-lynxos*) targ_emul=ppclynx ;; rs6000-*-aix[5-9]*) targ_emul=aix5rs6 ;; diff --git a/binutils/ld/emulparams/elf_ppc_haiku.sh b/binutils/ld/emulparams/elf32ppchaiku.sh similarity index 100% rename from binutils/ld/emulparams/elf_ppc_haiku.sh rename to binutils/ld/emulparams/elf32ppchaiku.sh