Ticket #2982: binutils-haiku-2.18.patch

binutils-2.18/bfd/config.bfd

@@ -270 +270 @@
     ;;
   arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-  arm*-*-eabi* )
+  arm*-*-eabi* | arm*-*-haiku*)
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
@@ -634 +634 @@
     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
     targ_selvecs="i386pe_vec"
@@ -815 +818 @@
     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
@@ -1102 +1109 @@
     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_cflags=-D__HAIKU_TARGET__
+    ;;
   powerpc-*-macos*)
     targ_defvec=pmac_xcoff_vec
     ;;

binutils-2.18/bfd/elf32-ppc.c

@@ -7580 +7580 @@
 #define TARGET_BIG_NAME     "elf32-powerpc"
 #define ELF_ARCH        bfd_arch_powerpc
 #define ELF_MACHINE_CODE    EM_PPC
-#ifdef __QNXTARGET__
+#if defined(__QNXTARGET__) || defined(__HAIKU_TARGET__)
 #define ELF_MAXPAGESIZE     0x1000
 #else
 #define ELF_MAXPAGESIZE     0x10000

binutils-2.18/gas/config/te-beos.h

@@ +1 @@
+/* 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"

binutils-2.18/gas/config/te-haiku.h

@@ +1 @@
+/* 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"

binutils-2.18/gas/configure.tgt

@@ -123 +123 @@
   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 ;;
   bfin-*-*)             fmt=elf bfd_gas=yes ;;
@@ -173 +174 @@
   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 ;;
@@ -258 +260 @@
   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 ;;
 
@@ -317 +320 @@
   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 ;;
   ppc-*-rtems*)             fmt=elf ;;

binutils-2.18/ld/Makefile.am

@@ -121 +121 @@
     earmelf.o \
     earmelfb.o \
     earmelf_fbsd.o \
+    earmelf_haiku.o \
     earmelf_linux.o \
     earmelf_linux_eabi.o \
     earmelfb_linux.o \
@@ -204 +205 @@
     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_i386_vxworks.o \
     eelf_s390.o \
     egld960.o \
@@ -531 +534 @@
   $(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)/emulparams/armelf.sh \
+  $(ELF_DEPS) $(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}
@@ -998 +1006 @@
   $(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 \
+  $(ELF_DEPS) $(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 \
+  $(ELF_DEPS) $(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}

binutils-2.18/ld/Makefile.in

@@ -368 +368 @@
     earmelf.o \
     earmelfb.o \
     earmelf_fbsd.o \
+    earmelf_haiku.o \
     earmelf_linux.o \
     earmelf_linux_eabi.o \
     earmelfb_linux.o \
@@ -451 +452 @@
     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_i386_vxworks.o \
     eelf_s390.o \
     egld960.o \
@@ -1357 +1360 @@
   $(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)/emulparams/armelf.sh \
+  $(ELF_DEPS) $(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}
@@ -1824 +1832 @@
   $(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 \
+  $(ELF_DEPS) $(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 \
+  $(ELF_DEPS) $(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}

binutils-2.18/ld/configure.tgt

@@ -93 +93 @@
             ;;
 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 ;;
@@ -269 +271 @@
             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 ;;
 i[3-7]86-*-vxworks*)    targ_emul=elf_i386_vxworks ;;
 i[3-7]86-*-chaos)   targ_emul=elf_i386_chaos
             ;;
@@ -337 +340 @@
 m68*-*-rtemscoff*)  targ_emul=m68kcoff ;;
 m68*-*-rtems*)      targ_emul=m68kelf
             ;;
+m68*-*-haiku*)      targ_emul=m68kelf
+            targ_extra_emuls=m68kcoff
+            ;;
 m8*-*-*)        targ_emul=m88kbcs
             ;;
 maxq-*-coff)            targ_emul=maxqcoff
@@ -480 +486 @@
 powerpc-*-aix*)     targ_emul=aixppc ;;
 powerpc-*-beos*)    targ_emul=aixppc ;;
 powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;;
+powerpc-*-haiku*)   targ_emul=elf_ppc_haiku ;;
 powerpc-*-lynxos*)  targ_emul=ppclynx ;;
 rs6000-*-aix5*)     targ_emul=aix5rs6 ;;
 rs6000-*-aix*)      targ_emul=aixrs6

binutils-2.18/ld/emulparams/armelf_haiku.sh

@@ +1 @@
+. ${srcdir}/emulparams/armelf.sh
+TEXT_START_ADDR=0x200000
+NONPAGED_TEXT_START_ADDR=0x200000
+MAXPAGESIZE=0x1000
+COMMONPAGESIZE=0x1000
+GENERATE_SHLIB_SCRIPT=yes
+TARGET2_TYPE=got-rel

binutils-2.18/ld/emulparams/elf_i386_haiku.sh

@@ +1 @@
+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

binutils-2.18/ld/emulparams/elf_ppc_haiku.sh

@@ +1 @@
+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) }
+"

binutils-2.18/libtool.m4

@@ -1598 +1598 @@
   lt_cv_dlopen_libs=
 
   case $host_os in
-  beos*)
+  beos* | haiku*)
     lt_cv_dlopen="load_add_on"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
@@ -2053 +2053 @@
   shlibpath_var=LIBRARY_PATH
   ;;
 
+haiku*)
+  library_names_spec='${libname}.so'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
 bsdi[[45]]*)
   version_type=linux
   need_version=no
@@ -2891 +2897 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -3110 +3120 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin* | *-*-haiku*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3411 +3421 @@
         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       fi
       ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5* | haiku*)
       # PIC is the default for these OSes.
       ;;
     mingw* | cygwin* | os2* | pw32*)
@@ -3706 +3716 @@
       fi
       ;;
 
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5* | haiku*)
       # PIC is the default for these OSes.
       ;;
 
@@ -4124 +4134 @@
       _LT_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    beos*)
+    beos* | haiku*)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
     _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
     # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
@@ -5448 +5458 @@
         fi
         ;;
 
-      beos*)
+      beos* | haiku*)
     if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc

binutils-2.18/ltmain.sh

@@ -3073 +3073 @@
       -l*)
     if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
       case $host in
-      *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+      *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*)
         # These systems don't actually have a C or math library (as such)
         continue
         ;;
@@ -4996 +4996 @@
       if test "$build_libtool_libs" = yes; then
     if test -n "$rpath"; then
       case $host in
-      *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+      *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
         # these systems don't actually have a c library (as such)!
         ;;
       *-*-rhapsody* | *-*-darwin1.[012])