Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -7893,3 +7893,4 @@ graphics/epeg|devel/efl|2015-10-11|Has expired: Merged into devel/efl x11-drivers/xf86-video-ati-ums||2015-10-13|Not supported by xorg-server 1.17 x11/nvidia-driver-173||2015-10-13|Does not support xorg-server 1.15 and higher +devel/cloudabi-binutils|devel/cloudabi-binutils-x86_64|2015-10-16|CloudABI now supports aarch64 as well Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -256,7 +256,8 @@ SUBDIR += clinfo SUBDIR += clisp-hyperspec SUBDIR += clojure-cider - SUBDIR += cloudabi-binutils + SUBDIR += cloudabi-binutils-aarch64 + SUBDIR += cloudabi-binutils-x86_64 SUBDIR += cloudabi-toolchain SUBDIR += cmake SUBDIR += cmake-fedora Index: devel/cloudabi-binutils-aarch64/Makefile =================================================================== --- devel/cloudabi-binutils-aarch64/Makefile +++ devel/cloudabi-binutils-aarch64/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMEPREFIX= cloudabi- -PORTREVISION= 1 +PKGNAMESUFFIX= -aarch64 MAINTAINER= ed@FreeBSD.org COMMENT= GNU Binutils for CloudABI cross-development @@ -11,6 +11,6 @@ PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -BUTARGET= x86_64-unknown-cloudabi +BUTARGET= aarch64-unknown-cloudabi .include "${MASTERDIR}/Makefile" Index: devel/cloudabi-binutils-aarch64/files/patch-cloudabi =================================================================== --- devel/cloudabi-binutils-aarch64/files/patch-cloudabi +++ devel/cloudabi-binutils-aarch64/files/patch-cloudabi @@ -1,78 +1,76 @@ --- bfd/config.bfd +++ bfd/config.bfd -@@ -645,6 +645,10 @@ case "${targ}" in - targ_archs="$targ_archs bfd_arm_arch" +@@ -177,6 +177,11 @@ + targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec" + want64=true ;; - #ifdef BFD64 -+ x86_64-*-cloudabi*) -+ targ_defvec=x86_64_elf64_cloudabi_vec ++ aarch64-*-cloudabi*) ++ targ_defvec=aarch64_elf64_le_cloudabi_vec ++ targ_selvecs=aarch64_elf64_be_cloudabi_vec + want64=true + ;; - x86_64-*-darwin*) - targ_defvec=x86_64_mach_o_vec - targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec" + aarch64-*-linux*) + targ_defvec=aarch64_elf64_le_vec + targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec" --- bfd/configure +++ bfd/configure -@@ -15540,6 +15540,7 @@ do - x86_64_elf32_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;; - x86_64_elf32_nacl_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;; - x86_64_elf64_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; -+ x86_64_elf64_cloudabi_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_fbsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_nacl_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_sol2_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; ---- bfd/configure.ac -+++ bfd/configure.ac -@@ -1008,6 +1008,7 @@ do - x86_64_elf32_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;; - x86_64_elf32_nacl_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;; - x86_64_elf64_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; -+ x86_64_elf64_cloudabi_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_fbsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_nacl_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; - x86_64_elf64_sol2_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;; ---- bfd/elf64-x86-64.c -+++ bfd/elf64-x86-64.c -@@ -5927,6 +5927,21 @@ static const struct bfd_elf_special_section - - #include "elf64-target.h" +@@ -15288,7 +15288,9 @@ + aarch64_elf32_be_vec) tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;; + aarch64_elf32_le_vec) tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;; + aarch64_elf64_be_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;; ++ aarch64_elf64_be_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;; + aarch64_elf64_le_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;; ++ aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;; + alpha_ecoff_le_vec) tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;; + alpha_elf64_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;; + alpha_elf64_fbsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;; +--- bfd/elfnn-aarch64.c ++++ bfd/elfnn-aarch64.c +@@ -8061,3 +8061,22 @@ + #define elf_backend_obj_attrs_section ".ARM.attributes" + #include "elfNN-target.h" ++ +/* CloudABI support. */ + -+#undef TARGET_LITTLE_SYM -+#define TARGET_LITTLE_SYM x86_64_elf64_cloudabi_vec -+#undef TARGET_LITTLE_NAME -+#define TARGET_LITTLE_NAME "elf64-x86-64-cloudabi" ++#undef TARGET_LITTLE_SYM ++#define TARGET_LITTLE_SYM aarch64_elfNN_le_cloudabi_vec ++#undef TARGET_LITTLE_NAME ++#define TARGET_LITTLE_NAME "elfNN-littleaarch64-cloudabi" ++#undef TARGET_BIG_SYM ++#define TARGET_BIG_SYM aarch64_elfNN_be_cloudabi_vec ++#undef TARGET_BIG_NAME ++#define TARGET_BIG_NAME "elfNN-bigaarch64-cloudabi" + +#undef ELF_OSABI -+#define ELF_OSABI ELFOSABI_CLOUDABI ++#define ELF_OSABI ELFOSABI_CLOUDABI + -+#undef elf64_bed -+#define elf64_bed elf64_x86_64_cloudabi_bed ++#undef elfNN_bed ++#define elfNN_bed elfNN_aarch64_cloudabi_bed + -+#include "elf64-target.h" -+ - /* FreeBSD support. */ - - #undef TARGET_LITTLE_SYM ++#include "elfNN-target.h" --- bfd/targets.c +++ bfd/targets.c -@@ -885,6 +885,7 @@ extern const bfd_target x86_64_coff_vec; - extern const bfd_target x86_64_elf32_vec; - extern const bfd_target x86_64_elf32_nacl_vec; - extern const bfd_target x86_64_elf64_vec; -+extern const bfd_target x86_64_elf64_cloudabi_vec; - extern const bfd_target x86_64_elf64_fbsd_vec; - extern const bfd_target x86_64_elf64_nacl_vec; - extern const bfd_target x86_64_elf64_sol2_vec; -@@ -1402,6 +1403,7 @@ static const bfd_target * const _bfd_target_vector[] = - &x86_64_elf32_vec, - &x86_64_elf32_nacl_vec, - &x86_64_elf64_vec, -+ &x86_64_elf64_cloudabi_vec, - &x86_64_elf64_fbsd_vec, - &x86_64_elf64_nacl_vec, - &x86_64_elf64_sol2_vec, +@@ -563,7 +563,9 @@ + extern const bfd_target aarch64_elf32_be_vec; + extern const bfd_target aarch64_elf32_le_vec; + extern const bfd_target aarch64_elf64_be_vec; ++extern const bfd_target aarch64_elf64_be_cloudabi_vec; + extern const bfd_target aarch64_elf64_le_vec; ++extern const bfd_target aarch64_elf64_le_cloudabi_vec; + extern const bfd_target alpha_ecoff_le_vec; + extern const bfd_target alpha_elf64_vec; + extern const bfd_target alpha_elf64_fbsd_vec; +@@ -938,7 +940,9 @@ + &aarch64_elf32_be_vec, + &aarch64_elf32_le_vec, + &aarch64_elf64_be_vec, ++ &aarch64_elf64_be_cloudabi_vec, + &aarch64_elf64_le_vec, ++ &aarch64_elf64_le_cloudabi_vec, + #endif + + #ifdef BFD64 --- gas/configure.tgt +++ gas/configure.tgt @@ -470,6 +470,7 @@ case ${generic_target} in @@ -93,68 +91,85 @@ #define ELFOSABI_C6000_ELFABI 64 /* Bare-metal TMS320C6000 */ #define ELFOSABI_C6000_LINUX 65 /* Linux TMS320C6000 */ #define ELFOSABI_ARM 97 /* ARM */ ---- ld/Makefile.am -+++ ld/Makefile.am -@@ -483,6 +483,7 @@ ALL_64_EMULATION_SOURCES = \ - eelf_k1om.c \ - eelf_k1om_fbsd.c \ - eelf_x86_64.c \ -+ eelf_x86_64_cloudabi.c \ - eelf_x86_64_fbsd.c \ - eelf_x86_64_nacl.c \ - eelf_x86_64_sol2.c \ -@@ -1938,6 +1939,10 @@ eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \ - eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - -+eelf_x86_64_cloudabi.c: $(srcdir)/emulparams/elf_x86_64_cloudabi.sh \ -+ $(srcdir)/emulparams/elf_x86_64.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ - eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \ - $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} --- ld/Makefile.in +++ ld/Makefile.in -@@ -808,6 +808,7 @@ ALL_64_EMULATION_SOURCES = \ - eelf_k1om.c \ - eelf_k1om_fbsd.c \ - eelf_x86_64.c \ -+ eelf_x86_64_cloudabi.c \ - eelf_x86_64_fbsd.c \ - eelf_x86_64_nacl.c \ - eelf_x86_64_sol2.c \ -@@ -1269,6 +1270,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om_fbsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@ -@@ -3429,6 +3431,10 @@ eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \ - eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} - -+eelf_x86_64_cloudabi.c: $(srcdir)/emulparams/elf_x86_64_cloudabi.sh \ -+ $(srcdir)/emulparams/elf_x86_64.sh \ -+ $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -+ - eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \ - $(srcdir)/emulparams/elf_x86_64.sh \ - $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} +@@ -727,6 +727,8 @@ + eaarch64elf32.c \ + eaarch64elfb.c \ + eaarch64elf32b.c \ ++ eaarch64cloudabi.c \ ++ eaarch64cloudabib.c \ + eaarch64linux.c \ + eaarch64linuxb.c \ + eaarch64linux32.c \ +@@ -3001,6 +3003,14 @@ + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \ + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ++eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \ ++ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \ ++ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ ++eaarch64cloudabib.c: $(srcdir)/emulparams/aarch64cloudabib.sh $(srcdir)/emulparams/aarch64cloudabi.sh \ ++ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \ ++ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ++ + eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \ + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \ + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} --- ld/configure.tgt +++ ld/configure.tgt -@@ -228,6 +228,7 @@ i[3-7]86-*-rtems*) targ_emul=elf_i386 ;; - i[3-7]86-*-aros*) targ_emul=elf_i386 ;; - i[3-7]86-*-rdos*) targ_emul=elf_i386 ;; - x86_64-*-rdos*) targ_emul=elf64rdos ;; -+x86_64-*-cloudabi*) targ_emul=elf_x86_64_cloudabi ;; - i[3-7]86-*-bsd) targ_emul=i386bsd ;; - i[3-7]86-*-bsd386) targ_emul=i386bsd ;; - i[3-7]86-*-bsdi*) targ_emul=i386bsd ;; ---- /dev/null -+++ ld/emulparams/elf_x86_64_cloudabi.sh +@@ -49,6 +49,8 @@ + targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b armelfb armelf" ;; + aarch64-*-elf) targ_emul=aarch64elf + targ_extra_emuls="aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb" ;; ++aarch64-*-cloudabi*) targ_emul=aarch64cloudabi ++ targ_extra_emuls=aarch64cloudabib ;; + aarch64_be-*-linux*) targ_emul=aarch64linuxb + targ_extra_libpath="aarch64linux aarch64linux32 aarch64linux32b armelfb_linux_eabi armelf_linux_eabi" + targ_extra_emuls="aarch64elfb aarch64elf aarch64elf32 aarch64elf32b armelfb armelf $targ_extra_libpath" ;; +--- ld/emulparams/aarch64cloudabi.sh ++++ ld/emulparams/aarch64cloudabi.sh +@@ -0,0 +1,37 @@ ++ARCH=aarch64 ++MACHINE= ++NOP=0 ++ ++SCRIPT_NAME=elf ++ELFSIZE=64 ++OUTPUT_FORMAT="elf64-littleaarch64-cloudabi" ++BIG_OUTPUT_FORMAT="elf64-bigaarch64-cloudabi" ++LITTLE_OUTPUT_FORMAT="elf64-littleaarch64-cloudabi" ++NO_REL_RELOCS=yes ++ ++TEMPLATE_NAME=elf32 ++EXTRA_EM_FILE=aarch64elf ++ ++GENERATE_SHLIB_SCRIPT=yes ++GENERATE_PIE_SCRIPT=yes ++ ++MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ++COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ++SEPARATE_GOTPLT=24 ++IREL_IN_PLT= ++ ++TEXT_START_ADDR=0x400000 ++ ++DATA_START_SYMBOLS='PROVIDE (__data_start = .);'; ++ ++# AArch64 does not support .s* sections. ++NO_SMALL_DATA=yes ++ ++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)) }' ++ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }' ++# Ensure each PLT entry is aligned to a cache line. ++PLT=".plt ${RELOCATING-0} : ALIGN(16) { *(.plt)${IREL_IN_PLT+ *(.iplt)} }" +--- ld/emulparams/aarch64cloudabib.sh ++++ ld/emulparams/aarch64cloudabib.sh @@ -0,0 +1,2 @@ -+. ${srcdir}/emulparams/elf_x86_64.sh -+OUTPUT_FORMAT="elf64-x86-64-cloudabi" ++. ${srcdir}/emulparams/aarch64cloudabi.sh ++OUTPUT_FORMAT="elf64-bigaarch64-cloudabi" Index: devel/cloudabi-binutils-aarch64/pkg-plist =================================================================== --- devel/cloudabi-binutils-aarch64/pkg-plist +++ devel/cloudabi-binutils-aarch64/pkg-plist @@ -1,58 +1,71 @@ -bin/x86_64-unknown-cloudabi-addr2line -bin/x86_64-unknown-cloudabi-ar -bin/x86_64-unknown-cloudabi-as -bin/x86_64-unknown-cloudabi-c++filt -bin/x86_64-unknown-cloudabi-elfedit -bin/x86_64-unknown-cloudabi-gprof -bin/x86_64-unknown-cloudabi-ld -bin/x86_64-unknown-cloudabi-ld.bfd -bin/x86_64-unknown-cloudabi-nm -bin/x86_64-unknown-cloudabi-objcopy -bin/x86_64-unknown-cloudabi-objdump -bin/x86_64-unknown-cloudabi-ranlib -bin/x86_64-unknown-cloudabi-readelf -bin/x86_64-unknown-cloudabi-size -bin/x86_64-unknown-cloudabi-strings -bin/x86_64-unknown-cloudabi-strip -man/man1/x86_64-unknown-cloudabi-addr2line.1.gz -man/man1/x86_64-unknown-cloudabi-ar.1.gz -man/man1/x86_64-unknown-cloudabi-as.1.gz -man/man1/x86_64-unknown-cloudabi-c++filt.1.gz -man/man1/x86_64-unknown-cloudabi-dlltool.1.gz -man/man1/x86_64-unknown-cloudabi-elfedit.1.gz -man/man1/x86_64-unknown-cloudabi-gprof.1.gz -man/man1/x86_64-unknown-cloudabi-ld.1.gz -man/man1/x86_64-unknown-cloudabi-nlmconv.1.gz -man/man1/x86_64-unknown-cloudabi-nm.1.gz -man/man1/x86_64-unknown-cloudabi-objcopy.1.gz -man/man1/x86_64-unknown-cloudabi-objdump.1.gz -man/man1/x86_64-unknown-cloudabi-ranlib.1.gz -man/man1/x86_64-unknown-cloudabi-readelf.1.gz -man/man1/x86_64-unknown-cloudabi-size.1.gz -man/man1/x86_64-unknown-cloudabi-strings.1.gz -man/man1/x86_64-unknown-cloudabi-strip.1.gz -man/man1/x86_64-unknown-cloudabi-windmc.1.gz -man/man1/x86_64-unknown-cloudabi-windres.1.gz -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.x -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xbn -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xc -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xd -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xdc -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xdw -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xn -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xr -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xs -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xsc -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xsw -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xu -x86_64-unknown-cloudabi/lib/ldscripts/elf_x86_64_cloudabi.xw -x86_64-unknown-cloudabi/bin/ar -x86_64-unknown-cloudabi/bin/as -x86_64-unknown-cloudabi/bin/ld -x86_64-unknown-cloudabi/bin/ld.bfd -x86_64-unknown-cloudabi/bin/nm -x86_64-unknown-cloudabi/bin/objcopy -x86_64-unknown-cloudabi/bin/objdump -x86_64-unknown-cloudabi/bin/ranlib -x86_64-unknown-cloudabi/bin/size -x86_64-unknown-cloudabi/bin/strip +bin/aarch64-unknown-cloudabi-addr2line +bin/aarch64-unknown-cloudabi-ar +bin/aarch64-unknown-cloudabi-as +bin/aarch64-unknown-cloudabi-c++filt +bin/aarch64-unknown-cloudabi-elfedit +bin/aarch64-unknown-cloudabi-gprof +bin/aarch64-unknown-cloudabi-ld +bin/aarch64-unknown-cloudabi-ld.bfd +bin/aarch64-unknown-cloudabi-nm +bin/aarch64-unknown-cloudabi-objcopy +bin/aarch64-unknown-cloudabi-objdump +bin/aarch64-unknown-cloudabi-ranlib +bin/aarch64-unknown-cloudabi-readelf +bin/aarch64-unknown-cloudabi-size +bin/aarch64-unknown-cloudabi-strings +bin/aarch64-unknown-cloudabi-strip +man/man1/aarch64-unknown-cloudabi-addr2line.1.gz +man/man1/aarch64-unknown-cloudabi-ar.1.gz +man/man1/aarch64-unknown-cloudabi-as.1.gz +man/man1/aarch64-unknown-cloudabi-c++filt.1.gz +man/man1/aarch64-unknown-cloudabi-dlltool.1.gz +man/man1/aarch64-unknown-cloudabi-elfedit.1.gz +man/man1/aarch64-unknown-cloudabi-gprof.1.gz +man/man1/aarch64-unknown-cloudabi-ld.1.gz +man/man1/aarch64-unknown-cloudabi-nlmconv.1.gz +man/man1/aarch64-unknown-cloudabi-nm.1.gz +man/man1/aarch64-unknown-cloudabi-objcopy.1.gz +man/man1/aarch64-unknown-cloudabi-objdump.1.gz +man/man1/aarch64-unknown-cloudabi-ranlib.1.gz +man/man1/aarch64-unknown-cloudabi-readelf.1.gz +man/man1/aarch64-unknown-cloudabi-size.1.gz +man/man1/aarch64-unknown-cloudabi-strings.1.gz +man/man1/aarch64-unknown-cloudabi-strip.1.gz +man/man1/aarch64-unknown-cloudabi-windmc.1.gz +man/man1/aarch64-unknown-cloudabi-windres.1.gz +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.x +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xbn +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xd +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xdc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xdw +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xn +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xr +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xs +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xsc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xsw +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xu +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabi.xw +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.x +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xbn +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xd +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xdc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xdw +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xn +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xr +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xs +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xsc +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xsw +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xu +aarch64-unknown-cloudabi/lib/ldscripts/aarch64cloudabib.xw +aarch64-unknown-cloudabi/bin/ar +aarch64-unknown-cloudabi/bin/as +aarch64-unknown-cloudabi/bin/ld +aarch64-unknown-cloudabi/bin/ld.bfd +aarch64-unknown-cloudabi/bin/nm +aarch64-unknown-cloudabi/bin/objcopy +aarch64-unknown-cloudabi/bin/objdump +aarch64-unknown-cloudabi/bin/ranlib +aarch64-unknown-cloudabi/bin/size +aarch64-unknown-cloudabi/bin/strip Index: devel/cloudabi-binutils-x86_64/Makefile =================================================================== --- devel/cloudabi-binutils-x86_64/Makefile +++ devel/cloudabi-binutils-x86_64/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PKGNAMEPREFIX= cloudabi- -PORTREVISION= 1 +PKGNAMESUFFIX= -x86_64 MAINTAINER= ed@FreeBSD.org COMMENT= GNU Binutils for CloudABI cross-development Index: devel/cloudabi-toolchain/Makefile =================================================================== --- devel/cloudabi-toolchain/Makefile +++ devel/cloudabi-toolchain/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cloudabi-toolchain -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= devel MAINTAINER= ed@FreeBSD.org @@ -12,7 +12,8 @@ LIBDIR= ${LOCALBASE}/x86_64-unknown-cloudabi/lib -RUN_DEPENDS+= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ +RUN_DEPENDS+= aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \ + x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64 \ x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang .include Index: lang/cloudabi-clang/Makefile =================================================================== --- lang/cloudabi-clang/Makefile +++ lang/cloudabi-clang/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloudabi-clang PORTVERSION= 3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= # None DISTFILES= # None @@ -14,7 +14,8 @@ LICENSE= MIT RUN_DEPENDS= clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \ - x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils + aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \ + x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64 LLVM_SUFFIX= ${DISTVERSION:S/.//}