From ab21027f8afb6012d201e31ed31c6b88a448351d Mon Sep 17 00:00:00 2001
From: François Revol <revol@free.fr>
Date: Sun, 19 Apr 2015 15:50:55 +0200
Subject: [PATCH] binutils: rename elf_ppc_haiku emulation to elf32ppchaiku

For coherence with other targets.
---
 binutils/ld/Makefile.am                 |  4 ++--
 binutils/ld/Makefile.in                 |  4 ++--
 binutils/ld/configure.tgt               |  2 +-
 binutils/ld/emulparams/elf32ppchaiku.sh | 20 ++++++++++++++++++++
 binutils/ld/emulparams/elf_ppc_haiku.sh | 20 --------------------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/binutils/ld/Makefile.am b/binutils/ld/Makefile.am
index 2877c39..d80fbf8 100644
--- a/binutils/ld/Makefile.am
+++ b/binutils/ld/Makefile.am
@@ -254,6 +254,7 @@
 	eelf32or1k_linux.c \
 	eelf32ppc.c \
 	eelf32ppc_fbsd.c \
+	eelf32ppchaiku.c \
 	eelf32ppclinux.c \
 	eelf32ppcnto.c \
 	eelf32ppcsim.c \
@@ -279,7 +280,6 @@
 	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 @@
   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 44d6f52..5dc5c02 100644
--- a/binutils/ld/Makefile.in
+++ b/binutils/ld/Makefile.in
@@ -562,6 +562,7 @@
 	eelf32or1k_linux.c \
 	eelf32ppc.c \
 	eelf32ppc_fbsd.c \
+	eelf32ppchaiku.c \
 	eelf32ppclinux.c \
 	eelf32ppcnto.c \
 	eelf32ppcsim.c \
@@ -587,7 +588,6 @@
 	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 @@
   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 dccb3d8..94cf5c4 100644
--- a/binutils/ld/configure.tgt
+++ b/binutils/ld/configure.tgt
@@ -611,7 +611,7 @@
 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/elf32ppchaiku.sh b/binutils/ld/emulparams/elf32ppchaiku.sh
new file mode 100644
index 0000000..5a65cd4 100644
--- /dev/null
+++ b/binutils/ld/emulparams/elf32ppchaiku.sh
@@ -1,0 +1,20 @@
+SCRIPT_NAME=elf
+OUTPUT_FORMAT="elf32-powerpc"
+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) }
+"
diff --git a/binutils/ld/emulparams/elf_ppc_haiku.sh b/binutils/ld/emulparams/elf_ppc_haiku.sh
deleted file mode 100644
index 5a65cd4..0000000 100644
--- a/binutils/ld/emulparams/elf_ppc_haiku.sh
+++ /dev/null
@@ -1,20 +1,0 @@
-SCRIPT_NAME=elf
-OUTPUT_FORMAT="elf32-powerpc"
-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) }
-"
--
gitore 0.2.2