Skip to content

Fix build when used as a submodule #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coresimd/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ use stdsimd_test::assert_instr;
#[cfg_attr(test, assert_instr(brk))]
#[inline]
pub unsafe fn brk() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
2 changes: 1 addition & 1 deletion coresimd/arm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ use stdsimd_test::assert_instr;
#[cfg_attr(test, assert_instr(udf))]
#[inline]
pub unsafe fn udf() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
2 changes: 1 addition & 1 deletion coresimd/mips/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ use stdsimd_test::assert_instr;
#[cfg_attr(test, assert_instr(break))]
#[inline]
pub unsafe fn break_() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
2 changes: 1 addition & 1 deletion coresimd/nvptx/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ pub unsafe fn _thread_idx_z() -> i32 {
/// Generates the trap instruction `TRAP`
#[inline]
pub unsafe fn trap() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
2 changes: 1 addition & 1 deletion coresimd/powerpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ use stdsimd_test::assert_instr;
#[cfg_attr(test, assert_instr(trap))]
#[inline]
pub unsafe fn trap() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
2 changes: 1 addition & 1 deletion coresimd/wasm32/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ pub mod memory;
#[cfg_attr(test, assert_instr(unreachable))]
#[inline]
pub unsafe fn unreachable() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}
11 changes: 3 additions & 8 deletions coresimd/wasm32/simd128.rs
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,7 @@ impl v128 {
c: [ImmByte; 16],
}
// FIXME: https://github.com/rust-lang/rust/issues/53193
const C: [ImmByte; 16] = unsafe {
U {
v: ::_core::u128::MAX,
}
.c
};
const C: [ImmByte; 16] = unsafe { U { v: ::u128::MAX }.c };
Self::xor(v128::const_(C), a)
}

Expand All @@ -664,15 +659,15 @@ impl v128 {
// #[target_feature(enable = "simd128")]
// FIXME: #[cfg_attr(test, assert_instr($id.load))]
pub unsafe fn load(m: *const v128) -> v128 {
::_core::ptr::read(m)
::ptr::read(m)
}

/// Store a `v128` vector to the given heap address.
#[inline]
// #[target_feature(enable = "simd128")]
// FIXME: #[cfg_attr(test, assert_instr($id.store))]
pub unsafe fn store(m: *mut v128, a: v128) {
::_core::ptr::write(m, a)
::ptr::write(m, a)
}
}

Expand Down
2 changes: 1 addition & 1 deletion coresimd/x86/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -520,5 +520,5 @@ use stdsimd_test::assert_instr;
#[cfg_attr(test, assert_instr(ud2))]
#[inline]
pub unsafe fn ud2() -> ! {
::_core::intrinsics::abort()
::intrinsics::abort()
}