gnu/binutils/binutils-2.18-aros.diff

   1 diff --git binutils-2.18/bfd/config.bfd binutils-2.18/bfd/config.bfd
   2 index 198dfe4..aaa12e8 100644
   3 --- binutils-2.18/bfd/config.bfd
   4 +++ binutils-2.18/bfd/config.bfd
   5 @@ -581,6 +581,10 @@ case "${targ}" in
   6      targ_selvecs="bfd_elf32_i386_vec i386coff_vec"
   7      want64=true
   8      ;;
   9 +  x86_64-*-aros*)
  10 +    targ_defvec=bfd_elf64_x86_64_vec
  11 +    want64=true
  12 +    ;;
  13    x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
  14      targ_defvec=bfd_elf64_x86_64_freebsd_vec
  15      targ_selvecs="bfd_elf32_i386_freebsd_vec i386coff_vec bfd_efi_app_ia32_vec bfd_efi_app_x86_64_vec bfd_elf32_i386_vec bfd_elf64_x86_64_vec"
  16 @@ -1102,6 +1102,9 @@ case "${targ}" in
  17      targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
  18      targ_archs="bfd_powerpc_arch bfd_rs6000_arch bfd_i386_arch"
  19      ;;
  20 +  powerpc-*-aros*)
  21 +    targ_defvec=bfd_elf32_powerpc_vec
  22 +    ;;
  23    powerpc-*-macos*)
  24      targ_defvec=pmac_xcoff_vec
  25      ;;
  26 diff --git binutils-2.18/binutils/readelf.c binutils-2.18/binutils/readelf.c
  27 index 9fc8e0c..57464a6 100644
  28 --- binutils-2.18/binutils/readelf.c
  29 +++ binutils-2.18/binutils/readelf.c
  30 @@ -2359,7 +2359,7 @@ get_osabi_name (unsigned int osabi)
  31      case ELFOSABI_OPENBSD:     return "UNIX - OpenBSD";
  32      case ELFOSABI_OPENVMS:     return "VMS - OpenVMS";
  33      case ELFOSABI_NSK:         return "HP - Non-Stop Kernel";
  34 -    case ELFOSABI_AROS:                return "Amiga Research OS";
  35 +    case ELFOSABI_AROS:                return "AROS";
  36      case ELFOSABI_STANDALONE:  return _("Standalone App");
  37      case ELFOSABI_ARM:         return "ARM";
  38      default:
  39 diff --git binutils-2.18/include/elf/common.h binutils-2.18/include/elf/common.h
  40 index 5b71782..324fa9c 100644
  41 --- binutils-2.18/include/elf/common.h
  42 +++ binutils-2.18/include/elf/common.h
  43 @@ -73,7 +73,7 @@
  44  #define ELFOSABI_OPENBSD     12        /* OpenBSD */
  45  #define ELFOSABI_OPENVMS     13        /* OpenVMS */
  46  #define ELFOSABI_NSK        14 /* Hewlett-Packard Non-Stop Kernel */
  47 -#define ELFOSABI_AROS       15 /* Amiga Research OS */
  48 +#define ELFOSABI_AROS       15 /* AROS */
  49  #define ELFOSABI_ARM        97 /* ARM */
  50  #define ELFOSABI_STANDALONE 255        /* Standalone (embedded) application */
  51
  52 diff --git binutils-2.18/ld/configure.tgt binutils-2.18/ld/configure.tgt
  53 index d4f53ef..2d43e8b 100644
  54 --- binutils-2.18/ld/configure.tgt
  55 +++ binutils-2.18/ld/configure.tgt
  56 @@ -234,6 +234,9 @@ i[3-7]86-*-elf*)    targ_emul=elf_i386 ;;
  57  x86_64-*-elf*)         targ_emul=elf_x86_64
  58                         targ_extra_emuls=elf_i386
  59                         ;;
  60 +x86_64-*-aros*)                targ_emul=elf_x86_64
  61 +                       targ_extra_emuls=elf_i386
  62 +                       ;;
  63  i[3-7]86-*-kaos*)      targ_emul=elf_i386 ;;
  64  i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
  65                         targ_emul=i386bsd ;;
  66 @@ -468,6 +468,7 @@ powerpc*-*-elf* | powerpc*-*-eabi* | powerpc*-*-sysv* \
  67  powerpc-*-vxworks*)
  68                         targ_emul=elf32ppcvxworks
  69                         targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim" ;;
  70 +powerpc-*-aros*)       targ_emul=elf32ppc ;;
  71  powerpc-*-nto*)         targ_emul=elf32ppcnto ;;
  72  powerpcle-*-nto*)       targ_emul=elf32lppcnto ;;
  73  powerpc-*-rtems*)      targ_emul=elf32ppc ;;