Auto merge of rust-lang#1111 - gnzlbg:xcode10, r=alexcrichton

update osx builds to xcode10
wezm · Oct 29, 2018 · 4a8304d · 4a8304d
2 parents 1eb08ed + 4182efd
commit 4a8304d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -73,15 +73,15 @@ matrix:
       rust: beta
     - os: osx
       env: TARGET=x86_64-apple-darwin NO_ADD=1
-      osx_image: xcode9.4
+      osx_image: xcode10
       rust: beta
 
     # nightly
     - env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
       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
@@ -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 |