Skip to content

Commit ae6daf7

Browse files
committed
Default to Cranelift newBE
1 parent 2ced8c0 commit ae6daf7

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
os: [ubuntu-latest, macos-latest]
1515
env:
1616
- BACKEND: ""
17-
- BACKEND: --features newbe
17+
- BACKEND: --oldbe
1818

1919
steps:
2020
- uses: actions/checkout@v2

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ libloading = { version = "0.6.0", optional = true }
3737
default = ["jit", "inline_asm"]
3838
jit = ["cranelift-jit", "libloading"]
3939
inline_asm = []
40-
newbe = []
40+
oldbe = []
4141

4242
[profile.dev]
4343
# By compiling dependencies with optimizations, performing tests gets much faster.

build.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
export CHANNEL="release"
66
build_sysroot=1
77
target_dir='build'
8-
newbe=''
8+
oldbe=''
99
while [[ $# != 0 ]]; do
1010
case $1 in
1111
"--debug")
@@ -18,12 +18,13 @@ while [[ $# != 0 ]]; do
1818
target_dir=$2
1919
shift
2020
;;
21-
"--newbe")
22-
newbe='--features newbe'
21+
"--oldbe")
22+
oldbe='--features oldbe'
2323
;;
2424
*)
2525
echo "Unknown flag '$1'"
26-
echo "Usage: ./build.sh [--debug] [--without-sysroot] [--target-dir DIR] [--newbe]"
26+
echo "Usage: ./build.sh [--debug] [--without-sysroot] [--target-dir DIR] [--oldbe]"
27+
exit 1
2728
;;
2829
esac
2930
shift
@@ -43,9 +44,9 @@ else
4344
exit 1
4445
fi
4546
if [[ "$CHANNEL" == "release" ]]; then
46-
cargo build $newbe --release
47+
cargo build $oldbe --release
4748
else
48-
cargo build $newbe
49+
cargo build $oldbe
4950
fi
5051

5152
rm -rf "$target_dir"

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ fn build_isa(sess: &Session) -> Box<dyn isa::TargetIsa + 'static> {
339339

340340
let flags = settings::Flags::new(flags_builder);
341341

342-
let variant = if cfg!(feature = "newbe") {
343-
cranelift_codegen::isa::BackendVariant::MachInst
344-
} else {
342+
let variant = if cfg!(feature = "oldbe") {
345343
cranelift_codegen::isa::BackendVariant::Legacy
344+
} else {
345+
cranelift_codegen::isa::BackendVariant::MachInst
346346
};
347347
let mut isa_builder = cranelift_codegen::isa::lookup_variant(target_triple, variant).unwrap();
348348
// Don't use "haswell", as it implies `has_lzcnt`.macOS CI is still at Ivy Bridge EP, so `lzcnt`

0 commit comments

Comments
 (0)