Skip to content

Commit

Permalink
Auto merge of rust-lang#78472 - hermitcore:builtins, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
add options to use optimized and mangled compiler builtins

In principle the compiler builtin features are also offered to alloc and std.
  • Loading branch information
bors committed Nov 15, 2020
2 parents 7504256 + 6de5125 commit 0468845
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions library/alloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ harness = false
[features]
compiler-builtins-mem = ['compiler_builtins/mem']
compiler-builtins-c = ["compiler_builtins/c"]
compiler-builtins-asm = ["compiler_builtins/asm"]
compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]
2 changes: 2 additions & 0 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ panic-unwind = ["panic_unwind"]
profiler = ["profiler_builtins"]
compiler-builtins-c = ["alloc/compiler-builtins-c"]
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
compiler-builtins-asm = ["alloc/compiler-builtins-asm"]
compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
llvm-libunwind = ["unwind/llvm-libunwind"]
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]

Expand Down

0 comments on commit 0468845

Please sign in to comment.