From eecbb214c7449cde0d28a4d24e8a4184f8658c3b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 03 Apr 2013 21:07:39 +0200 Subject: [PATCH] import binutils 2.22 --- binutils/configure | 2 +- binutils/configure.ac | 2 +- binutils/libtool.m4 | 2 +- binutils/bfd/config.bfd | 24 ++---------------------- binutils/bfd/configure | 2 +- binutils/bfd/elf32-ppc.c | 2 +- binutils/binutils/Makefile.am | 2 +- binutils/binutils/Makefile.in | 2 +- binutils/binutils/configure | 2 +- binutils/gas/configure | 2 +- binutils/gas/configure.tgt | 9 ++------- binutils/gprof/configure | 2 +- binutils/include/binary-io.h | 4 ++-- binutils/intl/loadmsgcat.c | 4 ++-- binutils/ld/Makefile.am | 17 ----------------- binutils/ld/Makefile.in | 17 ----------------- binutils/ld/configure | 4 ++-- binutils/ld/configure.tgt | 12 +----------- binutils/ld/ld.texinfo | 4 ++-- binutils/opcodes/configure | 2 +- binutils/bfd/doc/bfd.texinfo | 4 ++-- 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 -------------------- 28 files changed, 27 insertions(+), 174 deletions(-) diff --git a/binutils/configure b/binutils/configure index 9f58c87..eb69f28 100755 --- a/binutils/configure +++ b/binutils/configure @@ -2859,7 +2859,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* | *-*-dragonfly* \ | *-*-solaris2* | *-*-nto*) case "${target}" in diff --git a/binutils/configure.ac b/binutils/configure.ac index 3e34e18..57350a5 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -310,7 +310,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* | *-*-dragonfly* \ | *-*-solaris2* | *-*-nto*) case "${target}" in diff --git a/binutils/libtool.m4 b/binutils/libtool.m4 index 1fdb585..71bcee8 100644 --- a/binutils/libtool.m4 +++ b/binutils/libtool.m4 @@ -2329,7 +2329,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/bfd/config.bfd b/binutils/bfd/config.bfd index 57ff599..3b9872a 100644 --- a/binutils/bfd/config.bfd +++ b/binutils/bfd/config.bfd @@ -281,7 +281,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 ;; @@ -607,11 +607,6 @@ targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec" want64=true ;; - x86_64-*-haiku*) - targ_defvec=bfd_elf64_x86_64_vec - targ_selvecs="bfd_elf32_i386_vec" - want64=true - ;; x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep) targ_defvec=x86_64pe_vec targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386pe_vec i386pei_vec bfd_elf32_i386_vec" @@ -649,9 +644,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 @@ -843,11 +835,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 @@ -890,10 +879,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 @@ -1171,11 +1156,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="$targ_archs 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/configure b/binutils/bfd/configure index 9dc2486..bc242b9 100755 --- a/binutils/bfd/configure +++ b/binutils/bfd/configure @@ -10608,7 +10608,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/bfd/elf32-ppc.c b/binutils/bfd/elf32-ppc.c index cfad417..0c25c3e 100644 --- a/binutils/bfd/elf32-ppc.c +++ b/binutils/bfd/elf32-ppc.c @@ -9065,7 +9065,7 @@ #define ELF_ARCH bfd_arch_powerpc #define ELF_TARGET_ID PPC32_ELF_DATA #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/binutils/Makefile.am b/binutils/binutils/Makefile.am index 59f759f..bbe58e2 100644 --- a/binutils/binutils/Makefile.am +++ b/binutils/binutils/Makefile.am @@ -272,7 +272,7 @@ syslex.@OBJEXT@: syslex.c sysinfo.h config.h if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ else \ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ fi diff --git a/binutils/binutils/Makefile.in b/binutils/binutils/Makefile.in index 9fe5642..9f10781 100644 --- a/binutils/binutils/Makefile.in +++ b/binutils/binutils/Makefile.in @@ -1286,7 +1286,7 @@ syslex.@OBJEXT@: syslex.c sysinfo.h config.h if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \ else \ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ fi diff --git a/binutils/binutils/configure b/binutils/binutils/configure index 9ed900e..1a4a1ef 100755 --- a/binutils/binutils/configure +++ b/binutils/binutils/configure @@ -10403,7 +10403,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/gas/configure b/binutils/gas/configure index 2b55d3c..b70b86e 100755 --- a/binutils/gas/configure +++ b/binutils/gas/configure @@ -10391,7 +10391,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/gas/configure.tgt b/binutils/gas/configure.tgt index b95abfa..a171a32 100644 --- a/binutils/gas/configure.tgt +++ b/binutils/gas/configure.tgt @@ -121,7 +121,6 @@ fmt=coff em=wince-pe ;; arm-*-pe) fmt=coff em=pe ;; arm-*-riscix*) fmt=aout em=riscix ;; - arm-*-haiku*) fmt=elf em=haiku ;; avr-*-*) fmt=elf bfd_gas=yes ;; @@ -173,10 +172,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 ;; @@ -267,7 +265,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 ;; mep-*-elf) fmt=elf ;; @@ -296,7 +293,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 ;; @@ -330,10 +326,9 @@ ppc-*-aix5.[01]) fmt=coff em=aix5 ;; ppc-*-aix[5-9].*) 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/gprof/configure b/binutils/gprof/configure index aa8b067..fa68ffc 100755 --- a/binutils/gprof/configure +++ b/binutils/gprof/configure @@ -10321,7 +10321,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; 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 98d917d..5ae86ba 100644 --- a/binutils/ld/Makefile.am +++ b/binutils/ld/Makefile.am @@ -141,7 +141,6 @@ earmcoff.c \ earmelf.c \ earmelf_fbsd.c \ - earmelf_haiku.c \ earmelf_linux.c \ earmelf_linux_eabi.c \ earmelf_nbsd.c \ @@ -260,12 +259,9 @@ eelf_i386_be.c \ eelf_i386_chaos.c \ eelf_i386_fbsd.c \ - eelf_i386_haiku.c \ eelf_i386_ldso.c \ eelf_i386_sol2.c \ eelf_i386_vxworks.c \ - eelf_ppc_haiku.c \ - eelf_mipsel_haiku.c \ eelf_s390.c \ egld960.c \ egld960coff.c \ @@ -698,10 +694,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} @@ -1192,9 +1184,6 @@ $(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)" @@ -1203,12 +1192,6 @@ $(srcdir)/emultempl/solaris2.em \ $(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)/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 0c8d512..f062b92 100644 --- a/binutils/ld/Makefile.in +++ b/binutils/ld/Makefile.in @@ -447,7 +447,6 @@ earmcoff.c \ earmelf.c \ earmelf_fbsd.c \ - earmelf_haiku.c \ earmelf_linux.c \ earmelf_linux_eabi.c \ earmelf_nbsd.c \ @@ -566,12 +565,9 @@ eelf_i386_be.c \ eelf_i386_chaos.c \ eelf_i386_fbsd.c \ - eelf_i386_haiku.c \ eelf_i386_ldso.c \ eelf_i386_sol2.c \ eelf_i386_vxworks.c \ - eelf_ppc_haiku.c \ - eelf_mipsel_haiku.c \ eelf_s390.c \ egld960.c \ egld960coff.c \ @@ -2151,10 +2147,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} @@ -2645,18 +2637,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_sol2.c: $(srcdir)/emulparams/elf_i386_sol2.sh \ $(srcdir)/emulparams/solaris2.sh \ $(srcdir)/emultempl/solaris2.em \ diff --git a/binutils/ld/configure b/binutils/ld/configure index f67b793..9e4cb57 100755 --- a/binutils/ld/configure +++ b/binutils/ld/configure @@ -11342,7 +11342,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; @@ -15001,7 +15001,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/ld/configure.tgt b/binutils/ld/configure.tgt index 7c31e4e..197f27a 100644 --- a/binutils/ld/configure.tgt +++ b/binutils/ld/configure.tgt @@ -97,7 +97,6 @@ ;; arm-*-vxworks) targ_emul=armelf_vxworks ;; arm*-*-conix*) targ_emul=armelf ;; -arm*-*-haiku*) targ_emul=armelf_haiku; targ_extra_emuls=armelf ;; avr-*-*) targ_emul=avr2 targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega1 avrxmega2 avrxmega3 avrxmega4 avrxmega5 avrxmega6 avrxmega7" ;; @@ -277,9 +276,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 ;; @@ -351,9 +347,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 ;; @@ -379,9 +373,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" ;; @@ -518,7 +509,6 @@ 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-*-windiss*) targ_emul=elf32ppcwindiss ;; powerpc-*-lynxos*) targ_emul=ppclynx ;; rs6000-*-aix[5-9]*) targ_emul=aix5rs6 ;; diff --git a/binutils/ld/ld.texinfo b/binutils/ld/ld.texinfo index 929fd97..592e38c 100644 --- a/binutils/ld/ld.texinfo +++ b/binutils/ld/ld.texinfo @@ -7778,7 +7778,7 @@ @printindex cp @tex -% I think something like @@colophon should be in texinfo. In the +% I think something like @colophon should be in texinfo. In the % meantime: \long\def\colophon{\hbox to0pt{}\vfill \centerline{The body of this manual is set in} @@ -7789,7 +7789,7 @@ \centerline{{\sl\fontname\tensl\/}} \centerline{are used for emphasis.}\vfill} \page\colophon -% Blame: doc@@cygnus.com, 28mar91. +% Blame: doc@cygnus.com, 28mar91. @end tex @bye diff --git a/binutils/opcodes/configure b/binutils/opcodes/configure index 65ece59..746070e 100755 --- a/binutils/opcodes/configure +++ b/binutils/opcodes/configure @@ -10338,7 +10338,7 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/bfd/doc/bfd.texinfo b/binutils/bfd/doc/bfd.texinfo index c3ca5e7..45ffa73 100644 --- a/binutils/bfd/doc/bfd.texinfo +++ b/binutils/bfd/doc/bfd.texinfo @@ -322,7 +322,7 @@ @printindex cp @tex -% I think something like @@colophon should be in texinfo. In the +% I think something like @colophon should be in texinfo. In the % meantime: \long\def\colophon{\hbox to0pt{}\vfill \centerline{The body of this manual is set in} @@ -333,7 +333,7 @@ \centerline{{\sl\fontname\tensl\/}} \centerline{are used for emphasis.}\vfill} \page\colophon -% Blame: doc@@cygnus.com, 28mar91. +% Blame: doc@cygnus.com, 28mar91. @end tex @bye diff --git a/binutils/gas/config/tc-i386.c b/binutils/gas/config/tc-i386.c index 036e608..59182bb 100644 --- a/binutils/gas/config/tc-i386.c +++ b/binutils/gas/config/tc-i386.c @@ -306,8 +306,7 @@ && !defined (TE_NETWARE) \ && !defined (TE_FreeBSD) \ && !defined (TE_DragonFly) \ - && !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) } -" -- gitore 0.2.2