From a379fb3c4877c048c579c530da914f2806ff6d41 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 29 Oct 2018 15:28:19 +0100 Subject: [PATCH 1/2] update osx builds to xcode10 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2f9c073..cfa62f12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,10 +38,10 @@ matrix: - env: TARGET=i686-unknown-linux-gnu - os: osx env: TARGET=x86_64-apple-darwin NO_ADD=1 - osx_image: xcode9.4 + osx_image: xcode10 - os: osx env: TARGET=i686-apple-darwin - osx_image: xcode9.4 + osx_image: xcode10 - env: TARGET=arm-linux-androideabi - env: TARGET=aarch64-linux-android # FIXME(#826) should reenable From 4182efd1671dd93acc517cc2e19c14ea4a23ad9f Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 29 Oct 2018 16:18:16 +0100 Subject: [PATCH 2/2] update osx constants for xcode10 --- .travis.yml | 4 ++-- src/unix/bsd/apple/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfa62f12..da386aa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ matrix: rust: beta - os: osx env: TARGET=x86_64-apple-darwin NO_ADD=1 - osx_image: xcode9.4 + osx_image: xcode10 rust: beta # nightly @@ -95,7 +95,7 @@ matrix: rust: nightly - os: osx env: TARGET=x86_64-apple-darwin NO_ADD=1 - osx_image: xcode9.4 + osx_image: xcode10 rust: nightly # not available on stable # without --release the build fails diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index fe85eb92..1f0e0e00 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -785,8 +785,8 @@ pub const VM_FLAGS_SUPERPAGE_MASK: ::c_int = 0x70000; pub const VM_FLAGS_RETURN_DATA_ADDR: ::c_int = 0x100000; pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000; pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000; -pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401b; -pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401b; +pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401f; +pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401f; pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE | VM_FLAGS_RANDOM_ADDR | VM_FLAGS_OVERWRITE |