Skip to content

Commit

Permalink
Bug 1521249 part 2 - Make packed_simd compile with Rust 1.32 and late…
Browse files Browse the repository at this point in the history
…r. r=glandium

This adds the Firefox-required build.rs hack and reverts the commit
that added bitmasks in a way that depends on Rust 1.34 compiler
internals.

Depends on D20288

Differential Revision: https://phabricator.services.mozilla.com/D20289

--HG--
extra : moz-landing-system : lando
  • Loading branch information
hsivonen committed Mar 23, 2019
1 parent 7d1d8a5 commit 935b754
Show file tree
Hide file tree
Showing 39 changed files with 576 additions and 347 deletions.
5 changes: 5 additions & 0 deletions .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@ git = "https://github.com/glandium/cc-rs"
branch = "1.0.23-clang-cl-aarch64"
replace-with = "vendored-sources"

[source."https://github.com/rust-lang-nursery/packed_simd"]
git = "https://github.com/hsivonen/packed_simd"
branch = "rust_1_32"
replace-with = "vendored-sources"

[source.vendored-sources]
directory = '@top_srcdir@/third_party/rust'
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ libudev-sys = { path = "dom/webauthn/libudev-sys" }
serde_derive = { git = "https://github.com/servo/serde", branch = "deserialize_from_enums9" }
winapi = { git = "https://github.com/froydnj/winapi-rs", branch = "aarch64" }
cc = { git = "https://github.com/glandium/cc-rs", branch = "1.0.23-clang-cl-aarch64" }
packed_simd = { git = "https://github.com/hsivonen/packed_simd", branch = "rust_1_32" }
59 changes: 59 additions & 0 deletions third_party/rust/packed_simd/.appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
matrix:
allow_failures:
# FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/72
- TARGET: i686-pc-windows-msvc
- TARGET: i686-pc-windows-gnu
- TARGET: x86_64-pc-windows-gnu
fast_finish: true

environment:
matrix:
- TARGET: x86_64-pc-windows-msvc
MSYSTEM: MINGW64
NOVERIFY: "1"
- TARGET: x86_64-pc-windows-msvc
MSYSTEM: MINGW64
RUSTFLAGS: "-C target-feature=+sse4.2"
NOVERIFY: "1"
- TARGET: x86_64-pc-windows-msvc
MSYSTEM: MINGW64
RUSTFLAGS: "-C target-feature=+avx"
NOVERIFY: "1"
- TARGET: x86_64-pc-windows-msvc
MSYSTEM: MINGW64
RUSTFLAGS: "-C target-feature=+avx2"
NOVERIFY: "1"

- TARGET: i686-pc-windows-msvc
MSYSTEM: MINGW32
NOVERIFY: "1"
- TARGET: i686-pc-windows-msvc
MSYSTEM: MINGW32
RUSTFLAGS: "-C target-feature=+sse4.2"
NOVERIFY: "1"
- TARGET: i686-pc-windows-msvc
MSYSTEM: MINGW32
RUSTFLAGS: "-C target-feature=+avx"
NOVERIFY: "1"
- TARGET: i686-pc-windows-msvc
MSYSTEM: MINGW32
RUSTFLAGS: "-C target-feature=+avx2"
NOVERIFY: "1"

- TARGET: x86_64-pc-windows-gnu
MSYSTEM: MINGW64

- TARGET: i686-pc-windows-gnu
MSYSTEM: MINGW32
- TARGET: x86_64-pc-windows-gnu
MSYSTEM: MINGW64
install:
- ps: if (ls -r . -fi "*.rs" | sls "`t") { throw "Found tab character" }
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" -FileName "rust-install.exe"
- ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null
- ps: $env:PATH="$env:PATH;C:\rust\bin"
- set PATH=c:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%
- rustc -vV
- cargo -vV
build: false
test_script: bash -c "ci/run.sh"
2 changes: 1 addition & 1 deletion third_party/rust/packed_simd/.cargo-checksum.json

Large diffs are not rendered by default.

Loading

0 comments on commit 935b754

Please sign in to comment.