about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-11-19 16:26:23 +0100
committerGitHub <noreply@github.com>2020-11-19 16:26:23 +0100
commit29c8e50a10713873d6fd168d80facaaee86cfbbd (patch)
tree3630b69e94de7640d209141bbdc231905abcb666
parent3f0f224be48941f489bcb4b8bcd869d687c168af (diff)
parent207de019dc67ddb4fef17b526ab0e8ae7c971935 (diff)
downloadrust-29c8e50a10713873d6fd168d80facaaee86cfbbd.tar.gz
rust-29c8e50a10713873d6fd168d80facaaee86cfbbd.zip
Rollup merge of #79090 - hermitcore:builtins, r=Mark-Simulacrum
libary: Forward compiler-builtins "asm"  and "mangled-names" feature

In principle this is a followup of rust-lang/rust#78472. In the previous PR was the support of the test crate missing.

Now users will be able to do:
```
cargo build -Zbuild-std=core -Zbuild-std-features=compiler-builtins-asm
```
and correctly get the assembly implemenations for `memcpy` and friends.
-rw-r--r--library/test/Cargo.toml2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/test/Cargo.toml b/library/test/Cargo.toml
index 3d6910b107d..d5804cc3dd8 100644
--- a/library/test/Cargo.toml
+++ b/library/test/Cargo.toml
@@ -26,6 +26,8 @@ default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"]
 backtrace = ["std/backtrace"]
 compiler-builtins-c = ["std/compiler-builtins-c"]
 compiler-builtins-mem = ["std/compiler-builtins-mem"]
+compiler-builtins-asm = ["std/compiler-builtins-asm"]
+compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
 llvm-libunwind = ["std/llvm-libunwind"]
 system-llvm-libunwind = ["std/system-llvm-libunwind"]
 panic-unwind = ["std/panic_unwind"]