diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| -rwxr-xr-x | src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh | 3 | ||||
| -rw-r--r-- | src/libcore/internal_macros.rs | 6 | ||||
| m--------- | src/stdarch | 0 | ||||
| m--------- | src/tools/cargo | 0 |
5 files changed, 9 insertions, 2 deletions
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 504cba45570..47fec8d3ea9 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -13,7 +13,7 @@ use build_helper::output; use crate::Build; // The version number -pub const CFG_RELEASE_NUM: &str = "1.43.0"; +pub const CFG_RELEASE_NUM: &str = "1.43.1"; pub struct GitInfo { inner: Option<Info>, diff --git a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh index 3354a796c35..9db1f6ee083 100755 --- a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh @@ -33,7 +33,8 @@ ln -s ../../${target} /usr/lib/llvm-5.0/${target} # Install the C++ runtime libraries from CloudABI Ports. apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15 -add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi' +add-apt-repository -y \ + 'deb https://ci-mirrors.rust-lang.org/rustc/2020-05-04-cloudabi-apt-archive/ cloudabi cloudabi' apt-get update apt-get install -y "${target//_/-}-cxx-runtime" diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs index 4ea7dfc0735..8304a676918 100644 --- a/src/libcore/internal_macros.rs +++ b/src/libcore/internal_macros.rs @@ -117,3 +117,9 @@ macro_rules! impl_fn_for_zst { )+ } } + +#[allow(unused_macros)] +macro_rules! llvm_asm { + // Redirect to asm! for stdarch in stable 1.43 + ($($arg:tt)*) => { $crate::asm!($($arg)*) } +} diff --git a/src/stdarch b/src/stdarch -Subproject abe96ca3b87fcca6aa1dfcefd40d8c8d92d2e67 +Subproject d10eefc62284c40c5a95a2eed19fc1f414a5364 diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 3532cf738db005a56d1fe81ade514f380d41136 +Subproject 2cbe9048efc5c904b33191d799f97dc4698deba |