Skip to content

Commit cfef0a4

Browse files
committed
Merge commit 'e9d1a0a7b0b28dd422f1a790ccde532acafbf193' into sync_cg_clif-2022-08-24
1 parent 5a9b116 commit cfef0a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2292
-1259
lines changed

Diff for: .cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ task:
2222
- # Reduce amount of benchmark runs as they are slow
2323
- export COMPILE_RUNS=2
2424
- export RUN_RUNS=2
25-
- ./test.sh
25+
- ./y.rs test

Diff for: .github/workflows/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# Enable extra checks
104104
export CG_CLIF_ENABLE_VERIFIER=1
105105
106-
./test.sh
106+
./y.rs test
107107
108108
- name: Package prebuilt cg_clif
109109
run: tar cvfJ cg_clif.tar.xz build
@@ -162,14 +162,14 @@ jobs:
162162
#name: Test
163163
run: |
164164
# Enable backtraces for easier debugging
165-
#export RUST_BACKTRACE=1
165+
#$Env:RUST_BACKTRACE=1
166166
167167
# Reduce amount of benchmark runs as they are slow
168-
#export COMPILE_RUNS=2
169-
#export RUN_RUNS=2
168+
#$Env:COMPILE_RUNS=2
169+
#$Env:RUN_RUNS=2
170170
171171
# Enable extra checks
172-
#export CG_CLIF_ENABLE_VERIFIER=1
172+
#$Env:CG_CLIF_ENABLE_VERIFIER=1
173173
174174
./y.exe build
175175

Diff for: .gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ perf.data.old
88
*.string*
99
/y.bin
1010
/y.bin.dSYM
11+
/y.exe
12+
/y.pdb
1113
/build
1214
/build_sysroot/sysroot_src
1315
/build_sysroot/compiler-builtins
@@ -17,3 +19,4 @@ perf.data.old
1719
/regex
1820
/simple-raytracer
1921
/portable-simd
22+
/abi-checker

Diff for: Cargo.lock

+92-55
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.85.3", features = ["unwind", "all-arch"] }
12-
cranelift-frontend = "0.85.3"
13-
cranelift-module = "0.85.3"
14-
cranelift-native = "0.85.3"
15-
cranelift-jit = { version = "0.85.3", optional = true }
16-
cranelift-object = "0.85.3"
11+
cranelift-codegen = { version = "0.87.0", features = ["unwind", "all-arch"] }
12+
cranelift-frontend = "0.87.0"
13+
cranelift-module = "0.87.0"
14+
cranelift-native = "0.87.0"
15+
cranelift-jit = { version = "0.87.0", optional = true }
16+
cranelift-object = "0.87.0"
1717
target-lexicon = "0.12.0"
1818
gimli = { version = "0.26.0", default-features = false, features = ["write"]}
19-
object = { version = "0.28.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
19+
object = { version = "0.29.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

2121
ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
2222
indexmap = "1.9.1"

0 commit comments

Comments
 (0)