Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -34,21 +34,25 @@ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 -ONLY_FOR_ARCHS?= aarch64 amd64 i386 +ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler -BROKEN_aarch64= fails to build: bootstrap compiler crashes - CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. BOOTSTRAPS_DATE?= 2018-12-20 RUST_BOOTSTRAP_VERSION?= 1.31.1 +RUST_BOOTSTRAP_VERSION_armv6?= 1.32.0 +RUST_BOOTSTRAP_VERSION_armv7?= 1.32.0 +RUST_BOOTSTRAP_VERSION_powerpc64?= 1.32.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz CARGO_BOOTSTRAP_VERSION?= 0.32.0 +CARGO_BOOTSTRAP_VERSION_armv6?= 0.33.0 +CARGO_BOOTSTRAP_VERSION_armv7?= 0.33.0 +CARGO_BOOTSTRAP_VERSION_powerpc64?= 0.33.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz CARGO_VENDOR_DIR?= ${WRKSRC}/vendor @@ -58,9 +62,13 @@ # Rust's target arch string is different from *BSD arch strings RUST_ARCH_aarch64= aarch64 RUST_ARCH_amd64= x86_64 +RUST_ARCH_armv6= armv6 +RUST_ARCH_armv7= armv7 RUST_ARCH_i386= i686 +RUST_ARCH_powerpc64= powerpc64 RUST_ARCH_x86_64= x86_64 # dragonfly RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} +LLVM_TARGET= ${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit pkgconfig python:2.7,build ssl tar:xz @@ -83,6 +91,14 @@ .include +# avoid clash with files/*aarch* +.if ${ARCH} == powerpc64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-ppc64 +USE_GCC= 8 +.elif ${ARCH} == armv6 || ${ARCH} == armv7 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-arm +.endif + X_PY_ENV= HOME="${WRKDIR}" \ LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LIBSSH2_SYS_USE_PKG_CONFIG=1 \ @@ -149,9 +165,21 @@ -e 's,%CHANNEL%,${RUST_CHANNEL},' \ -e 's,%TARGET%,${RUST_TARGET},' \ -e 's,%CCACHE%,${CCACHE_VALUE},' \ + -e 's,%CC%,${CC},' \ + -e 's,%CXX%,${CXX},' \ < ${FILESDIR}/config.toml \ > ${WRKSRC}/config.toml +# no need to build a crosscompiler for these targets +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 + @${REINPLACE_CMD} -e 's,^#targets =.*,targets = "${LLVM_TARGET}",' \ + -e 's,^#experimental-targets =.*,experimental-targets = "",' \ + ${WRKSRC}/config.toml +.endif + @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ + ${WRKSRC}/src/librustc_llvm/build.rs \ + ${WRKSRC}/src/bootstrap/native.rs + post-configure: @for file in \ ${CARGO_VENDOR_DIR}/backtrace-sys/src/libbacktrace/configure \ @@ -264,6 +292,9 @@ BOOTSTRAPS_SOURCE_PKG_FBSDVER= 10 BOOTSTRAPS_SOURCE_PKG_FBSDVER_aarch64= 11 +BOOTSTRAPS_SOURCE_PKG_FBSDVER_armv6= 11 +BOOTSTRAPS_SOURCE_PKG_FBSDVER_armv7= 12 +BOOTSTRAPS_SOURCE_PKG_FBSDVER_powerpc64= 11 BOOTSTRAPS_SOURCE_PKG_REV= BOOTSTRAPS_SOURCE_PKG_URL= https://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}${BOOTSTRAPS_SOURCE_PKG_REV}.txz BOOTSTRAPS_SOURCE_PKG= ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${ARCH}.txz Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -13,3 +13,12 @@ SIZE (rust/2018-12-20/rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 69465005 SHA256 (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 32db6c8124e5cfeffb58576bbdbe9a8ec1317a31588d393a2be822e87efc55ab SIZE (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 6510783 +SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 0b353ca076218a182686e77347294b4cd4a2e0c597f73d2a7ef1fc8d474957c2 +SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = ad310b95e238371b57e55bf7fdbc2d1b23db4f5faccb1b4728303271c9e90f14 +SHA256 (rust/2018-12-20/rust-std-1.32.0-armv6-unknown-freebsd.tar.gz) = db027f82b9dce62d4810ce95807ea8c4025aae993f638fb4ea8be87b92c9ce94 +SHA256 (rust/2018-12-20/rust-std-1.32.0-armv7-unknown-freebsd.tar.gz) = b65612e026ece2de022710d017e94209e123f54f50cd822794a3b0a8b5818a6b +SHA256 (rust/2018-12-20/rustc-1.32.0-armv6-unknown-freebsd.tar.gz) = 49cd5df33a43b2cbd33c9bf2fde38665c3e7ff23ae403fcbd876b9950dae8122 +SHA256 (rust/2018-12-20/rustc-1.32.0-armv7-unknown-freebsd.tar.gz) = 43f18ee0638e74ccd732f1cfabff09444ae2c2eb15659fc10ff7c2487ff18860 +SHA256 (rust/2018-12-20/cargo-0.33.0-powerpc64-unknown-freebsd.tar.gz) = 08a724f4cba2a08fceb21aed7986ec3950dffec69955a041a421c69b2513641a +SHA256 (rust/2018-12-20/rust-std-1.32.0-powerpc64-unknown-freebsd.tar.gz) = d619921dfaccf70cde71b4a00f9dc03a8138d3379a6cb4d8729d74d931c2a38b +SHA256 (rust/2018-12-20/rustc-1.32.0-powerpc64-unknown-freebsd.tar.gz) = 83ccfca0e5c5e2df37ea3f4059dfe3e516c4f74045769dac4602a2da2b2ed1a5 Index: lang/rust/files/config.toml =================================================================== --- lang/rust/files/config.toml +++ lang/rust/files/config.toml @@ -24,10 +24,17 @@ # Rust release channel. channel = "%CHANNEL%" +default-linker = "%CC%" + [llvm] ccache = %CCACHE% +#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX;Hexagon" +#experimental-targets = "WebAssembly;RISCV" [target.%TARGET%] +cc = "%CC%" +cxx = "%CXX%" +linker = "%CC%" [dist] Index: lang/rust/files/extra-patch-arm =================================================================== --- lang/rust/files/extra-patch-arm +++ lang/rust/files/extra-patch-arm @@ -0,0 +1,410 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2018-11-19 14:20:07.096038000 +0100 ++++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2018-11-19 13:01:59.292790000 +0100 +@@ -1034,6 +1034,9 @@ cfg_if! { + } else if #[cfg(target_arch = "aarch64")] { + mod aarch64; + pub use self::aarch64::*; ++ } else if #[cfg(target_arch = "arm")] { ++ mod arm; ++ pub use self::arm::*; + } else { + // Unknown target_arch + } +--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2018-11-19 14:21:36.314181000 +0100 ++++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2018-11-19 14:22:10.808966000 +0100 +@@ -1034,6 +1034,9 @@ cfg_if! { + } else if #[cfg(target_arch = "aarch64")] { + mod aarch64; + pub use self::aarch64::*; ++ } else if #[cfg(target_arch = "arm")] { ++ mod arm; ++ pub use self::arm::*; + } else { + // Unknown target_arch + } +--- src/bootstrap/bootstrap.py 2018-09-20 19:28:03.000000000 +0200 ++++ src/bootstrap/bootstrap.py 2018-10-08 11:01:21.592493000 +0200 +@@ -266,6 +266,10 @@ def default_build_triple(): + cputype = 'arm' + if ostype == 'linux-android': + ostype = 'linux-androideabi' ++ elif ostype == 'unknown-freebsd': ++ cputype = subprocess.check_output( ++ ['uname', '-p']).strip().decode(default_encoding) ++ ostype = 'unknown-freebsd' + elif cputype == 'armv6l': + cputype = 'arm' + if ostype == 'linux-android': +--- src/libcompiler_builtins/build.rs 2018-09-20 19:28:21.000000000 +0200 ++++ src/libcompiler_builtins/build.rs 2018-10-03 18:38:37.822313000 +0200 +@@ -172,6 +172,7 @@ mod c { + "addvdi3.c", + "addvsi3.c", + "apple_versioning.c", ++ "clear_cache.c", + "clzdi2.c", + "clzsi2.c", + "cmpdi2.c", +--- src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs 2018-10-04 19:23:49.698272000 +0200 ++++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs 2018-10-07 20:41:57.711041000 +0200 +@@ -0,0 +1,38 @@ ++pub type c_char = u8; ++pub type c_long = i32; ++pub type c_ulong = u32; ++pub type time_t = i64; ++pub type suseconds_t = i32; ++ ++s! { ++ pub struct stat { ++ pub st_dev: ::dev_t, ++ pub st_ino: ::ino_t, ++ pub st_mode: ::mode_t, ++ pub st_nlink: ::nlink_t, ++ pub st_uid: ::uid_t, ++ pub st_gid: ::gid_t, ++ pub st_rdev: ::dev_t, ++ pub st_atime: ::time_t, ++ pub st_atime_nsec: ::c_long, ++ pub st_atime_pad: ::c_long, ++ pub st_mtime: ::time_t, ++ pub st_mtime_nsec: ::c_long, ++ pub st_mtime_pad: ::c_long, ++ pub st_ctime: ::time_t, ++ pub st_ctime_nsec: ::c_long, ++ pub st_ctime_pad: ::c_long, ++ pub st_size: ::off_t, ++ pub st_blocks: ::blkcnt_t, ++ pub st_blksize: ::blksize_t, ++ pub st_flags: ::fflags_t, ++ pub st_gen: ::uint32_t, ++ pub st_lspare: ::int32_t, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, ++ pub st_birthtime_pad: ::c_long, ++ } ++} ++ ++pub const MAP_32BIT: ::c_int = 0x00080000; ++pub const __MINSIGSTKSZ: ::size_t = 1024 * 4; +--- vendor/libc/src/unix/bsd/freebsdlike/freebsd/arm.rs 2018-10-04 19:23:49.699238000 +0200 ++++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/arm.rs 2018-10-07 20:42:43.150761000 +0200 +@@ -0,0 +1,38 @@ ++pub type c_char = u8; ++pub type c_long = i32; ++pub type c_ulong = u32; ++pub type time_t = i64; ++pub type suseconds_t = i32; ++ ++s! { ++ pub struct stat { ++ pub st_dev: ::dev_t, ++ pub st_ino: ::ino_t, ++ pub st_mode: ::mode_t, ++ pub st_nlink: ::nlink_t, ++ pub st_uid: ::uid_t, ++ pub st_gid: ::gid_t, ++ pub st_rdev: ::dev_t, ++ pub st_atime: ::time_t, ++ pub st_atime_nsec: ::c_long, ++ pub st_atime_pad: ::c_long, ++ pub st_mtime: ::time_t, ++ pub st_mtime_nsec: ::c_long, ++ pub st_mtime_pad: ::c_long, ++ pub st_ctime: ::time_t, ++ pub st_ctime_nsec: ::c_long, ++ pub st_ctime_pad: ::c_long, ++ pub st_size: ::off_t, ++ pub st_blocks: ::blkcnt_t, ++ pub st_blksize: ::blksize_t, ++ pub st_flags: ::fflags_t, ++ pub st_gen: ::uint32_t, ++ pub st_lspare: ::int32_t, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, ++ pub st_birthtime_pad: ::c_long, ++ } ++} ++ ++pub const MAP_32BIT: ::c_int = 0x00080000; ++pub const __MINSIGSTKSZ: ::size_t = 1024 * 4; +--- src/librustc_target/spec/armv6_unknown_freebsd.rs 2018-10-08 11:12:39.052521000 +0200 ++++ src/librustc_target/spec/armv6_unknown_freebsd.rs 2018-10-07 11:50:36.421354000 +0200 +@@ -0,0 +1,34 @@ ++// Copyright 2018 The Rust Project Developers. See the COPYRIGHT ++// file at the top-level directory of this distribution and at ++// http://rust-lang.org/COPYRIGHT. ++// ++// Licensed under the Apache License, Version 2.0 or the MIT license ++// , at your ++// option. This file may not be copied, modified, or distributed ++// except according to those terms. ++ ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++ ++pub fn target() -> TargetResult { ++ let base = super::freebsd_base::opts(); ++ Ok(Target { ++ llvm_target: "armv6-unknown-freebsd-gnueabihf".to_string(), ++ target_endian: "little".to_string(), ++ target_pointer_width: "32".to_string(), ++ target_c_int_width: "32".to_string(), ++ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), ++ arch: "arm".to_string(), ++ target_os: "freebsd".to_string(), ++ target_env: "gnueabihf".to_string(), ++ target_vendor: "unknown".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, ++ ++ options: TargetOptions { ++ features: "+v6,+vfp2".to_string(), ++ max_atomic_width: Some(64), ++ abi_blacklist: super::arm_base::abi_blacklist(), ++ .. base ++ } ++ }) ++} +--- src/librustc_target/spec/armv7_unknown_freebsd.rs 2018-10-04 19:23:49.698769000 +0200 ++++ src/librustc_target/spec/armv7_unknown_freebsd.rs 2018-10-05 14:35:21.642660000 +0200 +@@ -0,0 +1,34 @@ ++// Copyright 2018 The Rust Project Developers. See the COPYRIGHT ++// file at the top-level directory of this distribution and at ++// http://rust-lang.org/COPYRIGHT. ++// ++// Licensed under the Apache License, Version 2.0 or the MIT license ++// , at your ++// option. This file may not be copied, modified, or distributed ++// except according to those terms. ++ ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++ ++pub fn target() -> TargetResult { ++ let base = super::freebsd_base::opts(); ++ Ok(Target { ++ llvm_target: "armv7-unknown-freebsd-gnueabihf".to_string(), ++ target_endian: "little".to_string(), ++ target_pointer_width: "32".to_string(), ++ target_c_int_width: "32".to_string(), ++ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), ++ arch: "arm".to_string(), ++ target_os: "freebsd".to_string(), ++ target_env: "gnueabihf".to_string(), ++ target_vendor: "unknown".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, ++ ++ options: TargetOptions { ++ features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(), ++ max_atomic_width: Some(64), ++ abi_blacklist: super::arm_base::abi_blacklist(), ++ .. base ++ } ++ }) ++} +--- vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs 2018-10-08 11:13:18.159285000 +0200 ++++ vendor/rustc-ap-rustc_target/spec/armv6_unknown_freebsd.rs 2018-10-07 11:50:39.140286000 +0200 +@@ -0,0 +1,34 @@ ++// Copyright 2018 The Rust Project Developers. See the COPYRIGHT ++// file at the top-level directory of this distribution and at ++// http://rust-lang.org/COPYRIGHT. ++// ++// Licensed under the Apache License, Version 2.0 or the MIT license ++// , at your ++// option. This file may not be copied, modified, or distributed ++// except according to those terms. ++ ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++ ++pub fn target() -> TargetResult { ++ let base = super::freebsd_base::opts(); ++ Ok(Target { ++ llvm_target: "armv6-unknown-freebsd-gnueabihf".to_string(), ++ target_endian: "little".to_string(), ++ target_pointer_width: "32".to_string(), ++ target_c_int_width: "32".to_string(), ++ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), ++ arch: "arm".to_string(), ++ target_os: "freebsd".to_string(), ++ target_env: "gnueabihf".to_string(), ++ target_vendor: "unknown".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, ++ ++ options: TargetOptions { ++ features: "+v6,+vfp2".to_string(), ++ max_atomic_width: Some(64), ++ abi_blacklist: super::arm_base::abi_blacklist(), ++ .. base ++ } ++ }) ++} +--- vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs 2018-10-04 19:23:49.699689000 +0200 ++++ vendor/rustc-ap-rustc_target/spec/armv7_unknown_freebsd.rs 2018-10-05 14:36:44.411623000 +0200 +@@ -0,0 +1,34 @@ ++// Copyright 2018 The Rust Project Developers. See the COPYRIGHT ++// file at the top-level directory of this distribution and at ++// http://rust-lang.org/COPYRIGHT. ++// ++// Licensed under the Apache License, Version 2.0 or the MIT license ++// , at your ++// option. This file may not be copied, modified, or distributed ++// except according to those terms. ++ ++use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; ++ ++pub fn target() -> TargetResult { ++ let base = super::freebsd_base::opts(); ++ Ok(Target { ++ llvm_target: "armv7-unknown-freebsd-gnueabihf".to_string(), ++ target_endian: "little".to_string(), ++ target_pointer_width: "32".to_string(), ++ target_c_int_width: "32".to_string(), ++ data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), ++ arch: "arm".to_string(), ++ target_os: "freebsd".to_string(), ++ target_env: "gnueabihf".to_string(), ++ target_vendor: "unknown".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, ++ ++ options: TargetOptions { ++ features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(), ++ max_atomic_width: Some(64), ++ abi_blacklist: super::arm_base::abi_blacklist(), ++ .. base ++ } ++ }) ++} +--- src/librustc_target/spec/mod.rs 2018-09-20 19:28:03.000000000 +0200 ++++ src/librustc_target/spec/mod.rs 2018-10-07 10:52:24.555360000 +0200 +@@ -306,6 +306,8 @@ supported_targets! { + ("aarch64-linux-android", aarch64_linux_android), + + ("aarch64-unknown-freebsd", aarch64_unknown_freebsd), ++ ("armv6-unknown-freebsd", armv6_unknown_freebsd), ++ ("armv7-unknown-freebsd", armv7_unknown_freebsd), + ("i686-unknown-freebsd", i686_unknown_freebsd), + ("x86_64-unknown-freebsd", x86_64_unknown_freebsd), + +--- vendor/rustc-ap-rustc_target/spec/mod.rs 2018-09-20 20:58:02.000000000 +0200 ++++ vendor/rustc-ap-rustc_target/spec/mod.rs 2018-10-07 10:57:21.878934000 +0200 +@@ -306,6 +306,8 @@ supported_targets! { + ("aarch64-linux-android", aarch64_linux_android), + + ("aarch64-unknown-freebsd", aarch64_unknown_freebsd), ++ ("armv6-unknown-freebsd", armv6_unknown_freebsd), ++ ("armv7-unknown-freebsd", armv7_unknown_freebsd), + ("i686-unknown-freebsd", i686_unknown_freebsd), + ("x86_64-unknown-freebsd", x86_64_unknown_freebsd), + +--- vendor/backtrace/src/backtrace/libunwind.rs 2018-09-20 20:57:50.000000000 +0200 ++++ vendor/backtrace/src/backtrace/libunwind.rs 2018-10-03 18:42:36.907536000 +0200 +@@ -115,12 +115,14 @@ mod uw { + + // available since GCC 4.2.0, should be fine for our purpose + #[cfg(all(not(all(target_os = "android", target_arch = "arm")), ++ not(all(target_os = "freebsd", target_arch = "arm")), + not(all(target_os = "linux", target_arch = "arm"))))] + pub fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, + ip_before_insn: *mut c_int) + -> libc::uintptr_t; + + #[cfg(all(not(target_os = "android"), ++ not(all(target_os = "freebsd", target_arch = "arm")), + not(all(target_os = "linux", target_arch = "arm"))))] + pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void) + -> *mut c_void; +@@ -130,6 +132,7 @@ mod uw { + // expansion of the macro. This is all copy/pasted directly from the + // header file with the definition of _Unwind_GetIP. + #[cfg(any(all(target_os = "android", target_arch = "arm"), ++ all(target_os = "freebsd", target_arch = "arm"), + all(target_os = "linux", target_arch = "arm")))] + pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t { + #[repr(C)] +@@ -177,6 +180,7 @@ mod uw { + // This function doesn't exist on Android or ARM/Linux, so make it same + // to _Unwind_GetIP + #[cfg(any(all(target_os = "android", target_arch = "arm"), ++ all(target_os = "freebsd", target_arch = "arm"), + all(target_os = "linux", target_arch = "arm")))] + pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, + ip_before_insn: *mut c_int) +@@ -189,6 +193,7 @@ mod uw { + // This function also doesn't exist on Android or ARM/Linux, so make it + // a no-op + #[cfg(any(target_os = "android", ++ all(target_os = "freebsd", target_arch = "arm"), + all(target_os = "linux", target_arch = "arm")))] + pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void) + -> *mut c_void +--- src/liblibc/src/unix/bsd/freebsdlike/mod.rs 2018-11-22 13:49:08.899796000 +0100 ++++ src/liblibc/src/unix/bsd/freebsdlike/mod.rs 2018-11-22 13:49:38.884754000 +0100 +@@ -83,9 +83,9 @@ s! { + + pub struct stack_t { + // In FreeBSD 11 and later, ss_sp is actually a void* +- #[cfg(not(target_arch = "aarch64"))] ++ #[cfg(not(any(target_arch = "aarch64", target_arch = "arm")))] + pub ss_sp: *mut ::c_char, +- #[cfg(target_arch = "aarch64")] ++ #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] + pub ss_sp: *mut ::c_void, + pub ss_size: ::size_t, + pub ss_flags: ::c_int, +--- vendor/libc/src/unix/bsd/freebsdlike/mod.rs 2018-11-22 13:47:52.038109000 +0100 ++++ vendor/libc/src/unix/bsd/freebsdlike/mod.rs 2018-11-22 13:48:31.862867000 +0100 +@@ -83,9 +83,9 @@ s! { + + pub struct stack_t { + // In FreeBSD 11 and later, ss_sp is actually a void* +- #[cfg(not(target_arch = "aarch64"))] ++ #[cfg(not(any(target_arch = "aarch64", target_arch = "arm")))] + pub ss_sp: *mut ::c_char, +- #[cfg(target_arch = "aarch64")] ++ #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] + pub ss_sp: *mut ::c_void, + pub ss_size: ::size_t, + pub ss_flags: ::c_int, +--- src/libstd/os/raw/mod.rs 2018-11-22 13:53:58.570657000 +0100 ++++ src/libstd/os/raw/mod.rs 2018-11-22 13:54:47.466328000 +0100 +@@ -27,7 +27,8 @@ + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), + all(target_os = "l4re", target_arch = "x86_64"), +- all(target_os = "freebsd", target_arch = "aarch64"), ++ all(target_os = "freebsd", any(target_arch = "aarch64", ++ target_arch = "arm")), + all(target_os = "netbsd", any(target_arch = "aarch64", + target_arch = "arm", + target_arch = "powerpc")), +@@ -43,7 +44,8 @@ + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), + all(target_os = "l4re", target_arch = "x86_64"), +- all(target_os = "freebsd", target_arch = "aarch64"), ++ all(target_os = "freebsd", any(target_arch = "aarch64", ++ target_arch = "arm")), + all(target_os = "netbsd", any(target_arch = "aarch64", + target_arch = "arm", + target_arch = "powerpc")), +--- src/libstd/sys/unix/stack_overflow.rs 2018-11-22 13:55:32.806715000 +0100 ++++ src/libstd/sys/unix/stack_overflow.rs 2018-11-22 13:56:11.591672000 +0100 +@@ -154,14 +154,15 @@ mod imp { + target_os = "netbsd", + target_os = "openbsd", + target_os = "solaris"), +- all(target_os = "freebsd", target_arch = "aarch64")))] ++ all(target_os = "freebsd", any(target_arch = "aarch64", ++ target_arch = "arm"))))] + unsafe fn get_stack() -> libc::stack_t { + libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } + } + + #[cfg(all(any(target_os = "freebsd", + target_os = "dragonfly"), +- not(target_arch = "aarch64")))] ++ not(any(target_arch = "aarch64", target_arch = "arm"))))] + unsafe fn get_stack() -> libc::stack_t { + libc::stack_t { ss_sp: get_stackp() as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ } + }