diff options
| author | Jack Lloyd <[email protected]> | 2017-01-24 19:38:02 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-01-24 19:38:02 -0500 |
| commit | 53d69ce19b02051cbf732af00ab98bcf384561cd (patch) | |
| tree | 9257233777f7ab0eb2f1f2411bd363700ad30429 /src/lib/block/serpent | |
| parent | b49eaee216142ad6eab5ad437aea44b7897baf84 (diff) | |
Fix various SunCC and Solaris warnings and build problems.
Based on build output sent by @noloader.
If RLIMIT_MEMLOCK is not defined, assume regular user is not able to
call mlock. This probably also affected Clang/GCC on Solaris.
Work around resolution issue in SIMD_4x32 where it finds ambiguity
between arg taking uint32_t and __m128i. This is probably some
artifact of how SunCC represents vector types, and seems highly bogus
in general but is easy to work around here. Change constructor taking
a single value to instead be `SIMD_4x32::splat` function. The SIMD
class is internal, so no API implications.
Fix various warnings about lambda functions that were missing return
types and which were not a single return statement. AIUI C++11 doesn't
guarantee that lambda return type will be deduced in that situation,
though in practice every compiler including SunCC seems to handle it.
Disable AVX2 usage, since SunCC's intrinsics seem to be broken - its
_mm_loadu_si256 takes non-const pointer.
Rename a few variables in the tests to avoid shadowed var warnings.
Diffstat (limited to 'src/lib/block/serpent')
| -rw-r--r-- | src/lib/block/serpent/serpent_simd/serpent_simd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/block/serpent/serpent_simd/serpent_simd.cpp b/src/lib/block/serpent/serpent_simd/serpent_simd.cpp index f69d1f6f5..59ef46a6c 100644 --- a/src/lib/block/serpent/serpent_simd/serpent_simd.cpp +++ b/src/lib/block/serpent/serpent_simd/serpent_simd.cpp @@ -15,10 +15,10 @@ namespace { #define key_xor(round, B0, B1, B2, B3) \ do { \ - B0 ^= SIMD_32(m_round_key[4*round ]); \ - B1 ^= SIMD_32(m_round_key[4*round+1]); \ - B2 ^= SIMD_32(m_round_key[4*round+2]); \ - B3 ^= SIMD_32(m_round_key[4*round+3]); \ + B0 ^= SIMD_32::splat(m_round_key[4*round ]); \ + B1 ^= SIMD_32::splat(m_round_key[4*round+1]); \ + B2 ^= SIMD_32::splat(m_round_key[4*round+2]); \ + B3 ^= SIMD_32::splat(m_round_key[4*round+3]); \ } while(0); /* |