Skip to content

Commit

Permalink
Merge pull request #103 from byeongkeunahn/fix-ci
Browse files Browse the repository at this point in the history
Fix CI by upgrading compiler-builtins (0.1.111 -> 0.1.113)
  • Loading branch information
byeongkeunahn authored Jul 6, 2024
2 parents b5812be + 69b87b1 commit 0210b3f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ rustflags = ["-Z", "share-generics=no", "-Z", "export-executable-symbols", "-C",
rustflags = ["-Z", "share-generics=no", "-C", "relocation-model=pie"]

[target.x86_64-pc-windows-gnu]
rustflags = ["-Z", "share-generics=no", "-Z", "export-executable-symbols", "-C", "lto=thin", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "relocation-model=pie", "-C", "target-cpu=haswell"]
rustflags = ["-Z", "share-generics=no", "-Z", "export-executable-symbols", "-C", "embed-bitcode=yes", "-C", "lto=thin", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "relocation-model=pie", "-C", "target-cpu=haswell"]
linker = "x86_64-w64-mingw32-gcc"

[target.wasm32-unknown-unknown]
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ jobs:
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
python -m pip install pefile
- name: Clippy
run: cargo clippy --all-targets
env:
RUSTFLAGS: "-D warnings -A clippy::missing_safety_doc"
run: cargo clippy --all-targets -- -D warnings -A clippy::missing_safety_doc
- name: Rustfmt
run: cargo fmt --check --all
- name: Test
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ jobs:
brew install gcc
rustup component add rust-src --toolchain nightly-aarch64-apple-darwin
- name: Clippy
run: cargo clippy --all-targets
env:
RUSTFLAGS: "-D warnings -A clippy::missing_safety_doc"
run: cargo clippy --all-targets -- -D warnings -A clippy::missing_safety_doc
- name: Rustfmt
run: cargo fmt --check --all
- name: Test
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ jobs:
run: |
python -m pip install pefile
- name: Clippy
run: cargo clippy --all-targets
env:
RUSTFLAGS: "-D warnings -A clippy::missing_safety_doc"
run: cargo clippy --all-targets -- -D warnings -A clippy::missing_safety_doc
- name: Rustfmt
run: cargo fmt --check --all
- name: Test
Expand Down
12 changes: 6 additions & 6 deletions basm-std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ libm = "0.2.7"
ryu = "1.0"

[target.x86_64-pc-windows-msvc.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.x86_64-pc-windows-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.x86_64-unknown-linux-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.i686-unknown-linux-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.aarch64-apple-darwin.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.wasm32-unknown-unknown.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }

[features]
# Enables codegen routines.
Expand Down
10 changes: 5 additions & 5 deletions basm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ basm-macro = { path = "../basm-macro" }
basm-std = { path = "../basm-std", features = ["codegen"] }

[target.x86_64-pc-windows-msvc.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.x86_64-pc-windows-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.x86_64-unknown-linux-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.i686-unknown-linux-gnu.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }
[target.wasm32-unknown-unknown.dependencies]
compiler_builtins = { version = "0.1.111", features = ["mem"] }
compiler_builtins = { version = "0.1.113", features = ["mem"] }

[features]
short = ["basm-std/short"]
Expand Down
6 changes: 0 additions & 6 deletions basm/src/bin/lang_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ mod runtime {
unsafe { core::hint::unreachable_unchecked() }
}

// Temporary fix for Windows build failure.
// This should be removed later.
#[no_mangle]
#[cfg(target_os = "windows")]
extern "win64" fn __unordtf2() {}

#[no_mangle]
#[allow(non_snake_case)]
fn _Unwind_Resume() {
Expand Down

0 comments on commit 0210b3f

Please sign in to comment.