diff -rcp binutils-2.15/bfd/config.bfd binutils-2.15.totallypatched/bfd/config.bfd
*** binutils-2.15/bfd/config.bfd	Mon May 17 20:35:56 2004
--- binutils-2.15.totallypatched/bfd/config.bfd	Wed Jul  6 11:32:49 2005
*************** case "${targ}" in
*** 544,549 ****
--- 544,562 ----
      targ_defvec=bfd_elf32_i386_vec
      targ_selvecs="i386pe_vec i386pei_vec"
      ;;
+   i[3-7]86-*-haiku*)
+     targ_defvec=bfd_elf32_i386_vec
+     targ_selvecs="i386pe_vec i386pei_vec"
+     ;;
+   powerpc-*-haiku*)
+     targ_defvec=bfd_elf32_powerpc_vec
+     targ_selvecs="bfd_elf32_powerpcle_vec ppcboot_vec"
+     targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+     ;;
+   sparc-*-haiku*)
+     targ_defvec=bfd_elf32_sparc_vec
+     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
+     ;;
    i[3-7]86-*-interix*)
      targ_defvec=i386pei_vec
      targ_selvecs="i386pe_vec"
diff -rcp binutils-2.15/bfd/configure binutils-2.15.totallypatched/bfd/configure
*** binutils-2.15/bfd/configure	Mon May 17 20:35:57 2004
--- binutils-2.15.totallypatched/bfd/configure	Wed Jul  6 11:32:49 2005
*************** beos*)
*** 1607,1612 ****
--- 1607,1616 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
*************** rm -f conftest*
*** 5453,5458 ****
--- 5457,5463 ----
    powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
    powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
    powerpc-*-beos*)	;;
+   *-*-haiku*)		;;
    powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu)
  		        COREFILE='' ;;
    powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
diff -rcp binutils-2.15/bfd/configure.in binutils-2.15.totallypatched/bfd/configure.in
*** binutils-2.15/bfd/configure.in	Mon May 17 20:35:57 2004
--- binutils-2.15.totallypatched/bfd/configure.in	Wed Jul  6 11:57:59 2005
*************** changequote([,])dnl
*** 361,366 ****
--- 361,367 ----
    powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
    powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
    powerpc-*-beos*)	;;
+   *-*-haiku*)		;;
    powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu)
  		        COREFILE='' ;;
    powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
diff -rcp binutils-2.15/binutils/configure binutils-2.15.totallypatched/binutils/configure
*** binutils-2.15/binutils/configure	Fri Jan  2 17:08:04 2004
--- binutils-2.15.totallypatched/binutils/configure	Wed Jul  6 11:32:48 2005
*************** beos*)
*** 1493,1498 ****
--- 1493,1502 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
diff -rcp binutils-2.15/config.guess binutils-2.15.totallypatched/config.guess
*** binutils-2.15/config.guess	Mon May 17 20:36:20 2004
--- binutils-2.15.totallypatched/config.guess	Wed Jul  6 11:32:48 2005
*************** EOF
*** 1171,1176 ****
--- 1171,1184 ----
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit 0 ;;
+     *:Haiku:*:*)	# Hiaku running on Intel, PowerPC or SPARC systems.
+         case `uname -p` in
+             *86) UNAME_PROCESSOR=i586 ;;
+             powerpc) UNAME_PROCESSOR=powerpc ;;
+ 	    sparc) UNAME_PROCESSOR=sparc;;
+         esac
+         echo ${UNAME_PROCESSOR}-pc-haiku
+         exit 0 ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit 0 ;;
diff -rcp binutils-2.15/config.sub binutils-2.15.totallypatched/config.sub
*** binutils-2.15/config.sub	Mon May 17 20:36:20 2004
--- binutils-2.15.totallypatched/config.sub	Wed Jul  6 11:32:48 2005
*************** case $os in
*** 1163,1169 ****
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
--- 1163,1169 ----
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -haiku*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
*************** case $os in
*** 1181,1187 ****
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
! 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
--- 1181,1187 ----
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
! 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
*************** case $basic_machine in
*** 1367,1372 ****
--- 1367,1375 ----
  	*-be)
  		os=-beos
  		;;
+ 	*-haiku)
+ 		os=-haiku
+ 		;;
  	*-ibm)
  		os=-aix
  		;;
*************** case $basic_machine in
*** 1477,1482 ****
--- 1480,1488 ----
  				;;
  			-beos*)
  				vendor=be
+ 				;;
+ 			-haiku*)
+ 				vendor=haiku
  				;;
  			-hpux*)
  				vendor=hp
diff -rcp binutils-2.15/configure binutils-2.15.totallypatched/configure
*** binutils-2.15/configure	Mon May 17 20:36:20 2004
--- binutils-2.15.totallypatched/configure	Wed Jul  6 11:32:48 2005
*************** case "${host}" in
*** 1053,1058 ****
--- 1053,1061 ----
    i[3456789]86-*-beos*)
      noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
      ;;
+   *-*-haiku*)
+     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
+     ;;
    *-*-cygwin*)
      noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl"
      ;;
*************** case "${target}" in
*** 1349,1354 ****
--- 1352,1360 ----
      noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    i[3456789]86-*-beos*)
+     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
+     ;;
+   *-*-haiku*)
      noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
      ;;
    m32r-*-*)
diff -rcp binutils-2.15/configure.in binutils-2.15.totallypatched/configure.in
*** binutils-2.15/configure.in	Mon May 17 20:40:54 2004
--- binutils-2.15.totallypatched/configure.in	Wed Jul  6 11:32:48 2005
*************** case "${host}" in
*** 290,295 ****
--- 290,298 ----
    i[[3456789]]86-*-beos*)
      noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
      ;;
+   *-*-haiku*)
+     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
+     ;;
    *-*-cygwin*)
      noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl"
      ;;
*************** case "${target}" in
*** 582,587 ****
--- 585,593 ----
      noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    i[[3456789]]86-*-beos*)
+     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
+     ;;
+   *-*-haiku*)
      noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
      ;;
    m32r-*-*)
diff -rcp binutils-2.15/gas/configure binutils-2.15.totallypatched/gas/configure
*** binutils-2.15/gas/configure	Mon May 17 20:36:07 2004
--- binutils-2.15.totallypatched/gas/configure	Wed Jul  6 11:32:49 2005
*************** beos*)
*** 3308,3313 ****
--- 3308,3317 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ beos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
*************** for this_target in $target $canon_target
*** 4293,4298 ****
--- 4297,4303 ----
        i386-sequent-bsd*)		fmt=aout em=dynix ;;
        i386-*-beospe*)			fmt=coff em=pe ;;
        i386-*-beos*)			fmt=elf ;;
+       *-*-haiku*)			fmt=elf ;;
        i386-*-coff)			fmt=coff ;;
        i386-*-elf)			fmt=elf ;;
        i386-*-kaos*)			fmt=elf ;;
diff -rcp binutils-2.15/gas/configure.in binutils-2.15.totallypatched/gas/configure.in
*** binutils-2.15/gas/configure.in	Mon May 17 20:36:07 2004
--- binutils-2.15.totallypatched/gas/configure.in	Wed Jul  6 11:32:49 2005
*************** changequote([,])dnl
*** 263,268 ****
--- 263,269 ----
        i386-sequent-bsd*)		fmt=aout em=dynix ;;
        i386-*-beospe*)			fmt=coff em=pe ;;
        i386-*-beos*)			fmt=elf ;;
+       *-*-haiku*)			fmt=elf ;;
        i386-*-coff)			fmt=coff ;;
        i386-*-elf)			fmt=elf ;;
        i386-*-kaos*)			fmt=elf ;;
diff -rcp binutils-2.15/gprof/configure binutils-2.15.totallypatched/gprof/configure
*** binutils-2.15/gprof/configure	Tue Aug 26 18:19:19 2003
--- binutils-2.15.totallypatched/gprof/configure	Wed Jul  6 11:32:53 2005
*************** beos*)
*** 1489,1494 ****
--- 1489,1498 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
diff -rcp binutils-2.15/ld/configure binutils-2.15.totallypatched/ld/configure
*** binutils-2.15/ld/configure	Thu Apr 24 13:36:07 2003
--- binutils-2.15.totallypatched/ld/configure	Wed Jul  6 11:32:52 2005
*************** beos*)
*** 1497,1502 ****
--- 1497,1506 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
diff -rcp binutils-2.15/ld/configure.tgt binutils-2.15.totallypatched/ld/configure.tgt
*** binutils-2.15/ld/configure.tgt	Mon May 17 20:36:15 2004
--- binutils-2.15.totallypatched/ld/configure.tgt	Wed Jul  6 11:32:52 2005
*************** sparc*-*-aout)		targ_emul=sparcaout ;;
*** 48,53 ****
--- 48,54 ----
  sparc*-*-coff)		targ_emul=coff_sparc ;;
  sparc*-*-elf)		targ_emul=elf32_sparc ;;
  sparc*-*-sysv4*)	targ_emul=elf32_sparc ;;
+ sparc-*-haiku*)		targ_emul=elf32_sparc ;;
  sparc64-*-freebsd* | sparcv9-*-freebsd* | sparc64-*-kfreebsd*-gnu | sparcv9-*-kfreebsd*-gnu)
  			targ_emul=elf64_sparc_fbsd
  			targ_extra_emuls="elf64_sparc elf32_sparc"
*************** i[3-7]86-*-interix*)	targ_emul=i386pe_po
*** 230,235 ****
--- 231,238 ----
   			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_be ;;
+ 			##  Do we need to make a elf_i386_haiku targ_emul ?? Andy McCall
  i[3-7]86-*-vxworks*)	targ_emul=elf_i386 ;;
  i[3-7]86-*-chaos)	targ_emul=elf_i386_chaos ;;
  m8*-*-*)		targ_emul=m88kbcs ;;
*************** powerpcle-*-cygwin*)    targ_emul=ppcpe 
*** 532,537 ****
--- 535,541 ----
  powerpc-*-aix5*)	targ_emul=aix5ppc ;;
  powerpc-*-aix*)		targ_emul=aixppc ;;
  powerpc-*-beos*)	targ_emul=aixppc ;;
+ powerpc-*-haiku*)	targ_emul=elf32ppc ;;
  powerpc-*-windiss*)	targ_emul=elf32ppcwindiss ;;
  rs6000-*-aix5*)		targ_emul=aix5rs6 ;;
  rs6000-*-aix*)		targ_emul=aixrs6 ;;
diff -rcp binutils-2.15/libtool.m4 binutils-2.15.totallypatched/libtool.m4
*** binutils-2.15/libtool.m4	Fri Apr 11 04:58:39 2003
--- binutils-2.15.totallypatched/libtool.m4	Wed Jul  6 11:32:48 2005
*************** beos*)
*** 553,558 ****
--- 553,562 ----
    lt_cv_deplibs_check_method=pass_all
    ;;
  
+ haiku*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
  bsdi4*)
    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
    lt_cv_file_magic_cmd='/usr/bin/file -L'
*************** AC_DEFUN([AC_CHECK_LIBM],
*** 738,744 ****
  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
  LIBM=
  case $host in
! *-*-beos* | *-*-cygwin* | *-*-pw32*)
    # These system don't have libm
    ;;
  *-ncr-sysv4.3*)
--- 742,748 ----
  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
  LIBM=
  case $host in
! *-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32*)
    # These system don't have libm
    ;;
  *-ncr-sysv4.3*)
diff -rcp binutils-2.15/ltcf-c.sh binutils-2.15.totallypatched/ltcf-c.sh
*** binutils-2.15/ltcf-c.sh	Sun Dec  1 12:01:26 2002
--- binutils-2.15.totallypatched/ltcf-c.sh	Wed Jul  6 11:32:48 2005
*************** EOF
*** 98,103 ****
--- 98,114 ----
      fi
      ;;
  
+   haiku*)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     else
+       ld_shlibs=no
+     fi
+     ;;
+ 
    cygwin* | mingw*)
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
*************** else
*** 659,665 ****
        # like `-m68040'.
        ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      cygwin* | mingw* | os2*)
--- 670,676 ----
        # like `-m68040'.
        ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | haiku* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      cygwin* | mingw* | os2*)
diff -rcp binutils-2.15/ltcf-cxx.sh binutils-2.15.totallypatched/ltcf-cxx.sh
*** binutils-2.15/ltcf-cxx.sh	Thu Feb 20 01:12:28 2003
--- binutils-2.15.totallypatched/ltcf-cxx.sh	Wed Jul  6 11:32:48 2005
*************** if test "$with_gcc" = yes; then
*** 701,707 ****
      # like `-m68040'.
      ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
      ;;
!   beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;
    cygwin* | mingw* | os2*)
--- 701,707 ----
      # like `-m68040'.
      ac_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
      ;;
!   beos* | haiku* | irix5* | irix6* | osf3* | osf4* | osf5*)
      # PIC is the default for these OSes.
      ;;
    cygwin* | mingw* | os2*)
diff -rcp binutils-2.15/ltcf-gcj.sh binutils-2.15.totallypatched/ltcf-gcj.sh
*** binutils-2.15/ltcf-gcj.sh	Wed Feb 19 23:51:28 2003
--- binutils-2.15.totallypatched/ltcf-gcj.sh	Wed Jul  6 11:32:48 2005
*************** EOF
*** 101,106 ****
--- 101,117 ----
      fi
      ;;
  
+   haiku*)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     else
+       ld_shlibs=no
+     fi
+     ;;
+ 
    cygwin* | mingw*)
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
*************** fi
*** 607,613 ****
      ac_cv_prog_cc_static='-static'
  
      case $host_os in
!     beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      aix*)
--- 618,624 ----
      ac_cv_prog_cc_static='-static'
  
      case $host_os in
!     beos* | haiku* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      aix*)
diff -rcp binutils-2.15/ltconfig binutils-2.15.totallypatched/ltconfig
*** binutils-2.15/ltconfig	Sat Oct  4 05:54:47 2003
--- binutils-2.15.totallypatched/ltconfig	Wed Jul  6 11:32:48 2005
*************** beos*)
*** 1052,1057 ****
--- 1052,1066 ----
    lt_cv_dlopen_self=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
+   ;;
+ 
  bsdi4*)
    version_type=linux
    need_version=no
diff -rcp binutils-2.15/ltmain.sh binutils-2.15.totallypatched/ltmain.sh
*** binutils-2.15/ltmain.sh	Sat Mar 16 14:43:09 2002
--- binutils-2.15.totallypatched/ltmain.sh	Wed Jul  6 11:32:48 2005
*************** EOF
*** 1216,1222 ****
        -l*)
  	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
  	  case $host in
! 	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
  	    # These systems don't actually have a C or math library (as such)
  	    continue
  	    ;;
--- 1216,1222 ----
        -l*)
  	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
  	  case $host in
! 	  *-*-cygwin* | *-*-pw32* | *-*-beos | *-*-haiku*)
  	    # These systems don't actually have a C or math library (as such)
  	    continue
  	    ;;
*************** EOF
*** 2746,2752 ****
        if test "$build_libtool_libs" = yes; then
  	if test -n "$rpath"; then
  	  case $host in
! 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
  	    # these systems don't actually have a c library (as such)!
  	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])
--- 2746,2752 ----
        if test "$build_libtool_libs" = yes; then
  	if test -n "$rpath"; then
  	  case $host in
! 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
  	    # these systems don't actually have a c library (as such)!
  	    ;;
  	  *-*-rhapsody* | *-*-darwin1.[012])