Auto merge of #1111 - gnzlbg:xcode10, r=alexcrichton
update osx builds to xcode10
This commit is contained in:
commit
4a8304d47e
|
@ -38,10 +38,10 @@ matrix:
|
||||||
- env: TARGET=i686-unknown-linux-gnu
|
- env: TARGET=i686-unknown-linux-gnu
|
||||||
- os: osx
|
- os: osx
|
||||||
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
||||||
osx_image: xcode9.4
|
osx_image: xcode10
|
||||||
- os: osx
|
- os: osx
|
||||||
env: TARGET=i686-apple-darwin
|
env: TARGET=i686-apple-darwin
|
||||||
osx_image: xcode9.4
|
osx_image: xcode10
|
||||||
- env: TARGET=arm-linux-androideabi
|
- env: TARGET=arm-linux-androideabi
|
||||||
- env: TARGET=aarch64-linux-android
|
- env: TARGET=aarch64-linux-android
|
||||||
# FIXME(#826) should reenable
|
# FIXME(#826) should reenable
|
||||||
|
@ -73,7 +73,7 @@ matrix:
|
||||||
rust: beta
|
rust: beta
|
||||||
- os: osx
|
- os: osx
|
||||||
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
||||||
osx_image: xcode9.4
|
osx_image: xcode10
|
||||||
rust: beta
|
rust: beta
|
||||||
|
|
||||||
# nightly
|
# nightly
|
||||||
|
@ -81,7 +81,7 @@ matrix:
|
||||||
rust: nightly
|
rust: nightly
|
||||||
- os: osx
|
- os: osx
|
||||||
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
env: TARGET=x86_64-apple-darwin NO_ADD=1
|
||||||
osx_image: xcode9.4
|
osx_image: xcode10
|
||||||
rust: nightly
|
rust: nightly
|
||||||
# not available on stable
|
# not available on stable
|
||||||
# without --release the build fails
|
# without --release the build fails
|
||||||
|
|
|
@ -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_DATA_ADDR: ::c_int = 0x100000;
|
||||||
pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000;
|
pub const VM_FLAGS_RETURN_4K_DATA_ADDR: ::c_int = 0x800000;
|
||||||
pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000;
|
pub const VM_FLAGS_ALIAS_MASK: ::c_int = 0xFF000000;
|
||||||
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401b;
|
pub const VM_FLAGS_USER_ALLOCATE: ::c_int = 0xff07401f;
|
||||||
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401b;
|
pub const VM_FLAGS_USER_MAP: ::c_int = 0xff97401f;
|
||||||
pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE |
|
pub const VM_FLAGS_USER_REMAP: ::c_int = VM_FLAGS_FIXED | VM_FLAGS_ANYWHERE |
|
||||||
VM_FLAGS_RANDOM_ADDR |
|
VM_FLAGS_RANDOM_ADDR |
|
||||||
VM_FLAGS_OVERWRITE |
|
VM_FLAGS_OVERWRITE |
|
||||||
|
|
Loading…
Reference in New Issue