⛏️ index : buildtools.git

author Jérôme Duval <jerome.duval@gmail.com> 2012-01-05 22:33:17.0 +01:00:00
committer Jérôme Duval <jerome.duval@gmail.com> 2012-01-06 0:11:05.0 +01:00:00
commit
54b66b3b479404053af79683d9f22df2ec064f6e [patch]
tree
b935eb8796ff8ab106d675252da63837dc2745ad
parent
30bb6f454f7ff2e7011f2daa7cae685a886ae63f
download
54b66b3b479404053af79683d9f22df2ec064f6e.tar.gz

import binutils 2.19



Diff

 binutils/configure                         |  2 +-
 binutils/configure.ac                      |  2 +-
 binutils/libtool.m4                        | 15 +--------------
 binutils/bfd/config.bfd                    | 24 ++----------------------
 binutils/bfd/elf32-ppc.c                   |  2 +-
 binutils/gas/configure.tgt                 |  9 ++-------
 binutils/include/binary-io.h               |  4 ++--
 binutils/intl/loadmsgcat.c                 |  4 ++--
 binutils/ld/Makefile.am                    | 17 -----------------
 binutils/ld/Makefile.in                    | 17 -----------------
 binutils/ld/configure.tgt                  | 12 +-----------
 binutils/gas/config/tc-i386.c              |  3 +--
 binutils/gas/config/te-beos.h              | 10 ----------
 binutils/gas/config/te-haiku.h             | 10 ----------
 binutils/ld/emulparams/armelf_haiku.sh     | 24 ------------------------
 binutils/ld/emulparams/elf_i386_haiku.sh   | 11 -----------
 binutils/ld/emulparams/elf_mipsel_haiku.sh |  2 --
 binutils/ld/emulparams/elf_ppc_haiku.sh    | 20 --------------------
 18 files changed, 14 insertions(+), 174 deletions(-)

diff --git a/binutils/configure b/binutils/configure
index e324d21..a8cf680 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -2049,7 +2049,7 @@
  is_elf=no
  case "${target}" in
    *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
    | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* | *-*-haiku* \
    | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
    | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*)
      case "${target}" in
        *-*-linux*aout* | *-*-linux*oldld*)
diff --git a/binutils/configure.ac b/binutils/configure.ac
index 3093f1e..78c8390 100644
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -304,7 +304,7 @@
  is_elf=no
  case "${target}" in
    *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
    | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* | *-*-haiku* \
    | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
    | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*)
      case "${target}" in
        *-*-linux*aout* | *-*-linux*oldld*)
diff --git a/binutils/libtool.m4 b/binutils/libtool.m4
index e47754a..26a039a 100644
--- a/binutils/libtool.m4
+++ b/binutils/libtool.m4
@@ -2211,15 +2211,6 @@
  hardcode_into_libs=yes
  ;;

haiku*)
  library_names_spec='${libname}.so'
  dynamic_linker="$host_os ld.so"
  shlibpath_var=LIBRARY_PATH
  lt_cv_dlopen="load_add_on"
  lt_cv_dlopen_libs=
  lt_cv_dlopen_self=yes
  ;;

hpux9* | hpux10* | hpux11*)
  # Give a soname corresponding to the major version so that dld.sl refuses to
  # link against other versions.
@@ -2897,10 +2888,6 @@
  ;;

gnu*)
  lt_cv_deplibs_check_method=pass_all
  ;;

haiku*)
  lt_cv_deplibs_check_method=pass_all
  ;;

@@ -3123,7 +3110,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin* | *-*-haiku*)
*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
  # These system don't have libm, or don't need it
  ;;
*-ncr-sysv4.3*)
diff --git a/binutils/bfd/config.bfd b/binutils/bfd/config.bfd
index 02f8c48..9309502 100644
--- a/binutils/bfd/config.bfd
+++ b/binutils/bfd/config.bfd
@@ -271,7 +271,7 @@
    ;;
  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
  arm*-*-eabi* | arm*-*-haiku*)
  arm*-*-eabi* )
    targ_defvec=bfd_elf32_littlearm_vec
    targ_selvecs=bfd_elf32_bigarm_vec
    ;;
@@ -614,11 +614,6 @@
    targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec bfd_efi_bsdrv_ia32_vec bfd_efi_rtdrv_ia32_vec bfd_efi_app_x86_64_vec bfd_efi_bsdrv_x86_64_vec bfd_efi_rtdrv_x86_64_vec"
    want64=true
    ;;
  x86_64-*-haiku*)
    targ_defvec=bfd_elf64_x86_64_vec
    targ_selvecs="bfd_elf32_i386_vec"
    want64=true
    ;;
  x86_64-*-mingw*)
    targ_defvec=x86_64pe_vec
    targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec"
@@ -656,9 +651,6 @@
  i[3-7]86-*-beoself* | i[3-7]86-*-beos*)
    targ_defvec=bfd_elf32_i386_vec
    targ_selvecs="i386pe_vec i386pei_vec"
    ;;
  i[3-7]86-*-haiku*)
    targ_defvec=bfd_elf32_i386_vec
    ;;
  i[3-7]86-*-interix*)
    targ_defvec=i386pei_vec
@@ -840,11 +832,8 @@
    targ_defvec=bfd_elf32_m68k_vec
    targ_selvecs=ieee_vec
    targ_underscore=yes
    ;;
  m68*-*-haiku*)
    targ_defvec=bfd_elf32_m68k_vec
    targ_selvecs="m68kcoff_vec ieee_vec"
    ;;

  m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
    targ_defvec=bfd_elf32_m88k_vec
    targ_selvecs=m88kbcs_vec
@@ -887,10 +876,6 @@
  mips*el-*-netbsd*)
    targ_defvec=bfd_elf32_tradlittlemips_vec
    targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
    ;;
  mips*el-*-haiku*)
    targ_defvec=bfd_elf32_littlemips_vec
    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
    ;;
  mips*-*-netbsd*)
    targ_defvec=bfd_elf32_tradbigmips_vec
@@ -1134,11 +1119,6 @@
    targ_defvec=mach_o_be_vec
    targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
    targ_archs="bfd_powerpc_arch bfd_rs6000_arch bfd_i386_arch"
    ;;
  powerpc-*-haiku*)
    targ_defvec=bfd_elf32_powerpc_vec
    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec pef_vec pef_xlib_vec pmac_xcoff_vec ppcboot_vec"
    targ_cflags=-D__HAIKU_TARGET__
    ;;
  powerpc-*-macos*)
    targ_defvec=pmac_xcoff_vec
diff --git a/binutils/bfd/elf32-ppc.c b/binutils/bfd/elf32-ppc.c
index 2ce6556..1d9cabd 100644
--- a/binutils/bfd/elf32-ppc.c
+++ b/binutils/bfd/elf32-ppc.c
@@ -8054,7 +8054,7 @@
#define TARGET_BIG_NAME		"elf32-powerpc"
#define ELF_ARCH		bfd_arch_powerpc
#define ELF_MACHINE_CODE	EM_PPC
#if defined(__QNXTARGET__) || defined(__HAIKU_TARGET__)

#ifdef __QNXTARGET__
#define ELF_MAXPAGESIZE		0x1000
#else
#define ELF_MAXPAGESIZE		0x10000
diff --git a/binutils/gas/configure.tgt b/binutils/gas/configure.tgt
index 58c29f2..76b10be 100644
--- a/binutils/gas/configure.tgt
+++ b/binutils/gas/configure.tgt
@@ -123,7 +123,6 @@
  arm-wince-pe | arm-*-wince)		fmt=coff em=wince-pe ;;
  arm-*-pe | thumb-*-pe)		fmt=coff em=pe ;;
  arm-*-riscix*)			fmt=aout em=riscix ;;
  arm-*-haiku*)				fmt=elf  em=haiku ;;

  avr-*-*)				fmt=elf bfd_gas=yes ;;

@@ -175,10 +174,9 @@
  i386-ibm-aix*)			fmt=coff em=i386aix ;;
  i386-sequent-bsd*)			fmt=aout em=dynix ;;
  i386-*-beospe*)			fmt=coff em=pe ;;
  i386-*-beos*)				fmt=elf em=beos ;;
  i386-*-beos*)				fmt=elf ;;
  i386-*-coff)				fmt=coff ;;
  i386-*-elf)				fmt=elf ;;
  i386-*-haiku*)			fmt=elf em=haiku ;;
  i386-*-kaos*)				fmt=elf ;;
  i386-*-bsd*)				fmt=aout em=386bsd ;;
  i386-*-netbsd0.8)			fmt=aout em=386bsd ;;
@@ -264,7 +262,6 @@
  m68k-*-netbsd*)			fmt=aout em=nbsd bfd_gas=yes ;;
  m68k-*-openbsd*)			fmt=aout em=nbsd bfd_gas=yes ;;
  m68k-*-psos*)				fmt=elf em=psos;;
  m68k-*-haiku*)			fmt=elf em=haiku ;;

  maxq-*-coff)      			fmt=coff bfd_gas=yes ;;

@@ -291,7 +288,6 @@
  mips-*-elf* | mips-*-rtems*)		fmt=elf ;;
  mips-*-netbsd*)			fmt=elf em=tmips ;;
  mips-*-openbsd*)			fmt=elf em=tmips ;;
  mips*-*-haiku*)			fmt=elf endian=little em=haiku ;;

  mmix-*-*)				fmt=elf ;;

@@ -322,10 +318,9 @@
  ppc-*-aix5.[01])			fmt=coff em=aix5 ;;
  ppc-*-aix5.*)				fmt=coff em=aix5 ;;
  ppc-*-aix*)				fmt=coff ;;
  ppc-*-beos*)				fmt=coff em=beos ;;
  ppc-*-beos*)				fmt=coff ;;
  ppc-*-*n*bsd* | ppc-*-elf*)		fmt=elf ;;
  ppc-*-eabi* | ppc-*-sysv4*)		fmt=elf ;;
  ppc-*-haiku*)				fmt=elf em=haiku ;;
  ppc-*-linux-*)			fmt=elf em=linux ;;
  ppc-*-solaris*)			fmt=elf em=solaris ;;
  ppc-*-rtems*)				fmt=elf ;;
diff --git a/binutils/include/binary-io.h b/binutils/include/binary-io.h
index 30d716b..2984271 100644
--- a/binutils/include/binary-io.h
+++ b/binutils/include/binary-io.h
@@ -30,8 +30,8 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
#if defined(__BEOS__) || defined(__HAIKU__)

  /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect.  */
#ifdef __BEOS__
  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
# undef O_BINARY
# undef O_TEXT
#endif
diff --git a/binutils/intl/loadmsgcat.c b/binutils/intl/loadmsgcat.c
index 8d282ae..536ee12 100644
--- a/binutils/intl/loadmsgcat.c
+++ b/binutils/intl/loadmsgcat.c
@@ -480,8 +480,8 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
#if defined(__BEOS__) || defined(__HAIKU__)

  /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect.  */
#ifdef __BEOS__
  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
# undef O_BINARY
# undef O_TEXT
#endif
diff --git a/binutils/ld/Makefile.am b/binutils/ld/Makefile.am
index 4e81d0e..0093c88 100644
--- a/binutils/ld/Makefile.am
+++ b/binutils/ld/Makefile.am
@@ -121,7 +121,6 @@
	earmelf.o \
	earmelfb.o \
	earmelf_fbsd.o \
	earmelf_haiku.o \
	earmelf_linux.o \
	earmelf_linux_eabi.o \
	earmelfb_linux.o \
@@ -209,10 +208,7 @@
	eelf_i386_be.o \
	eelf_i386_chaos.o \
	eelf_i386_fbsd.o \
	eelf_i386_haiku.o \
	eelf_i386_ldso.o \
	eelf_ppc_haiku.o \
	eelf_mipsel_haiku.o \
	eelf_i386_vxworks.o \
	eelf_s390.o \
	egld960.o \
@@ -543,10 +539,6 @@
  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} armelf_fbsd "$(tdir_armelf_fbsd)"
earmelf_haiku.c: $(srcdir)/emulparams/armelf_haiku.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} armelf_haiku "$(tdir_armelf_haiku)"
earmelf_linux.c: $(srcdir)/emulparams/armelf_linux.sh \
  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1031,18 +1023,9 @@
  $(srcdir)/emulparams/elf_i386.sh \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)"
eelf_i386_haiku.c: $(srcdir)/emulparams/elf_i386_haiku.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_haiku "$(tdir_elf_i386_haiku)"
eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
eelf_ppc_haiku.c: $(srcdir)/emulparams/elf_ppc_haiku.sh \
  $(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 \
  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_mipsel_haiku "$(tdir_elf_mipsel_haiku)"
eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
  $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/binutils/ld/Makefile.in b/binutils/ld/Makefile.in
index dcf3960..309e8e6 100644
--- a/binutils/ld/Makefile.in
+++ b/binutils/ld/Makefile.in
@@ -372,7 +372,6 @@
	earmelf.o \
	earmelfb.o \
	earmelf_fbsd.o \
	earmelf_haiku.o \
	earmelf_linux.o \
	earmelf_linux_eabi.o \
	earmelfb_linux.o \
@@ -460,10 +459,7 @@
	eelf_i386_be.o \
	eelf_i386_chaos.o \
	eelf_i386_fbsd.o \
	eelf_i386_haiku.o \
	eelf_i386_ldso.o \
	eelf_ppc_haiku.o \
	eelf_mipsel_haiku.o \
	eelf_i386_vxworks.o \
	eelf_s390.o \
	egld960.o \
@@ -1373,10 +1369,6 @@
  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} armelf_fbsd "$(tdir_armelf_fbsd)"
earmelf_haiku.c: $(srcdir)/emulparams/armelf_haiku.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} armelf_haiku "$(tdir_armelf_haiku)"
earmelf_linux.c: $(srcdir)/emulparams/armelf_linux.sh \
  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1861,18 +1853,9 @@
  $(srcdir)/emulparams/elf_i386.sh \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)"
eelf_i386_haiku.c: $(srcdir)/emulparams/elf_i386_haiku.sh \
  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_haiku "$(tdir_elf_i386_haiku)"
eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)"
eelf_mipsel_haiku.c:  $(srcdir)/emulparams/elf_mipsel_haiku.sh \
  $(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)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
	${GENSCRIPTS} elf_ppc_haiku "$(tdir_elf_ppc_haiku)"
eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
  $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/binutils/ld/configure.tgt b/binutils/ld/configure.tgt
index f6cb438..3f7e79b 100644
--- a/binutils/ld/configure.tgt
+++ b/binutils/ld/configure.tgt
@@ -93,7 +93,6 @@
			;;
arm-*-vxworks)		targ_emul=armelf_vxworks ;;
arm*-*-conix*)		targ_emul=armelf ;;
arm*-*-haiku*)		targ_emul=armelf_haiku; targ_extra_emuls=armelf ;;
thumb-*-linux-* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
strongarm-*-coff)	targ_emul=armcoff ;;
strongarm-*-elf)	targ_emul=armelf ;;
@@ -275,9 +274,6 @@
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
i[3-7]86-*-beospe*)	targ_emul=i386beos ;;
i[3-7]86-*-beos*)	targ_emul=elf_i386_be ;;
i[3-7]86-*-haiku*)	targ_emul=elf_i386_haiku ;;
x86_64-*-haiku*)	targ_emul=elf_x86_64
			targ_extra_emuls=elf_i386_haiku ;;
i[3-7]86-*-vxworks*)	targ_emul=elf_i386_vxworks ;;
i[3-7]86-*-chaos)	targ_emul=elf_i386_chaos
			;;
@@ -344,9 +340,7 @@
			targ_extra_emuls="m68kelfnbsd m68k4knbsd" ;;
m68*-*-psos*)		targ_emul=m68kpsos ;;
m68*-*-rtemscoff*)	targ_emul=m68kcoff ;;
m68*-*-rtems*)		targ_emul=m68kelf ;;
m68*-*-haiku*)		targ_emul=m68kelf
			targ_extra_emuls=m68kcoff
m68*-*-rtems*)		targ_emul=m68kelf
			;;
m8*-*-*)		targ_emul=m88kbcs
			;;
@@ -371,9 +365,6 @@
mips*el-*-netbsd*)	targ_emul=elf32ltsmip
			targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
			;;
mips*el-*-haiku*)	targ_emul=elf_mipsel_haiku
			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" 
			;;
mips*-*-netbsd*)	targ_emul=elf32btsmip
			targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip"
  			;;
@@ -494,7 +485,6 @@
powerpc-*-aix5*)	targ_emul=aix5ppc ;;
powerpc-*-aix*)		targ_emul=aixppc ;;
powerpc-*-beos*)	targ_emul=aixppc ;;
powerpc-*-haiku*)	targ_emul=elf_ppc_haiku ;;
powerpc-*-windiss*)	targ_emul=elf32ppcwindiss ;;
powerpc-*-lynxos*)	targ_emul=ppclynx ;;
rs6000-*-aix5*)		targ_emul=aix5rs6 ;;
diff --git a/binutils/gas/config/tc-i386.c b/binutils/gas/config/tc-i386.c
index 4525b7b..df76ae9 100644
--- a/binutils/gas/config/tc-i386.c
+++ b/binutils/gas/config/tc-i386.c
@@ -319,8 +319,7 @@
	 && !defined (TE_LINUX)				\
 	 && !defined (TE_NETWARE)			\
	 && !defined (TE_FreeBSD)			\
	 && !defined (TE_NetBSD)			\
	 && !defined (TE_BeOS)))
	 && !defined (TE_NetBSD)))
/* This array holds the chars that always start a comment.  If the
   pre-processor is disabled, these aren't very useful.  The option
   --divide will remove '/' from this list.  */
diff --git a/binutils/gas/config/te-beos.h b/binutils/gas/config/te-beos.h
deleted file mode 100644
index af472ad..0000000 100644
--- a/binutils/gas/config/te-beos.h
+++ /dev/null
@@ -1,10 +1,0 @@
/* Target environment for BeOS/Haiku.  It is the same as the generic
   target, except that it arranges via the TE_BeOS define to
   suppress the use of "/" as a comment character.  Some code in the
   haiku kernel uses "/" to mean division.  (What a concept!)  */
#define TE_BeOS 1

#define LOCAL_LABELS_DOLLAR 1
#define LOCAL_LABELS_FB 1

#include "obj-format.h"
diff --git a/binutils/gas/config/te-haiku.h b/binutils/gas/config/te-haiku.h
deleted file mode 100644
index af472ad..0000000 100644
--- a/binutils/gas/config/te-haiku.h
+++ /dev/null
@@ -1,10 +1,0 @@
/* Target environment for BeOS/Haiku.  It is the same as the generic
   target, except that it arranges via the TE_BeOS define to
   suppress the use of "/" as a comment character.  Some code in the
   haiku kernel uses "/" to mean division.  (What a concept!)  */
#define TE_BeOS 1

#define LOCAL_LABELS_DOLLAR 1
#define LOCAL_LABELS_FB 1

#include "obj-format.h"
diff --git a/binutils/ld/emulparams/armelf_haiku.sh b/binutils/ld/emulparams/armelf_haiku.sh
deleted file mode 100644
index 39b7f65..0000000 100644
--- a/binutils/ld/emulparams/armelf_haiku.sh
+++ /dev/null
@@ -1,24 +1,0 @@
ARCH=arm
SCRIPT_NAME=elf
OUTPUT_FORMAT="elf32-littlearm"
BIG_OUTPUT_FORMAT="elf32-bigarm"
LITTLE_OUTPUT_FORMAT="elf32-littlearm"
MAXPAGESIZE=0x8000
COMMONPAGESIZE=0x1000
TEMPLATE_NAME=elf32
EXTRA_EM_FILE=armelf
GENERATE_SHLIB_SCRIPT=yes
GENERATE_PIE_SCRIPT=yes

DATA_START_SYMBOLS='__data_start = . ;';
OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
OTHER_BSS_SYMBOLS='__bss_start__ = .;'
OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ;'
OTHER_END_SYMBOLS='__end__ = . ;'
OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'

TEXT_START_ADDR=0x00008000
TARGET2_TYPE=got-rel

# ARM does not support .s* sections.
NO_SMALL_DATA=yes
diff --git a/binutils/ld/emulparams/elf_i386_haiku.sh b/binutils/ld/emulparams/elf_i386_haiku.sh
deleted file mode 100644
index 25ca6bc..0000000 100644
--- a/binutils/ld/emulparams/elf_i386_haiku.sh
+++ /dev/null
@@ -1,11 +1,0 @@
SCRIPT_NAME=elf
OUTPUT_FORMAT="elf32-i386"
TEXT_START_ADDR=0x200000
NONPAGED_TEXT_START_ADDR=0x200000
MAXPAGESIZE=0x1000
ARCH=i386
MACHINE=
NOP=0x90909090
TEMPLATE_NAME=elf32
GENERATE_SHLIB_SCRIPT=yes
NO_SMALL_DATA=yes
diff --git a/binutils/ld/emulparams/elf_mipsel_haiku.sh b/binutils/ld/emulparams/elf_mipsel_haiku.sh
deleted file mode 100644
index ff9c325..0000000 100644
--- a/binutils/ld/emulparams/elf_mipsel_haiku.sh
+++ /dev/null
@@ -1,2 +1,0 @@
. ${srcdir}/emulparams/elf32lmip.sh

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) }
"