Skip to content
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.

Sign up for GitHub

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

Clear alignment warnings on ARM 32-bit platforms #828

Merged
merged 3 commits into from
Apr 30, 2019
Merged

Clear alignment warnings on ARM 32-bit platforms #828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fcc3c4
Try fix MSVC 2013 compile
noloader Apr 30, 2019
76fc6ec
Try fix MSVC 2013 compile
noloader Apr 30, 2019
4590d98
Disable move_conditional_bytes until it can be tested
noloader Apr 30, 2019
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
Next Next commit
Try fix MSVC 2013 compile
  • Loading branch information
@noloader
noloader committed Apr 30, 2019
commit 7fcc3c4ff04745aa7095ead157c8161a248f479e
12 changes: 6 additions & 6 deletions blake2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
#endif

#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
const unsigned int ALIGN_SPEC32=16;
const unsigned int ALIGN_SPEC64=16;
static const unsigned int ALIGN_SPEC32=16;
static const unsigned int ALIGN_SPEC64=16;
#elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32);
const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64);
static const unsigned int ALIGN_SPEC32=alignof(CryptoPP::word32);
static const unsigned int ALIGN_SPEC64=alignof(CryptoPP::word64);
#else
// Can't use GetAlignmentOf<word64>() because of C++11 constexpr
const unsigned int ALIGN_SPEC32=4;
const unsigned int ALIGN_SPEC64=8;
static const unsigned int ALIGN_SPEC32=4;
static const unsigned int ALIGN_SPEC64=8;
#endif

NAMESPACE_BEGIN(CryptoPP)
Expand Down
6 changes: 3 additions & 3 deletions donna_32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ extern const char DONNA32_FNAME[] = __FILE__;
ANONYMOUS_NAMESPACE_BEGIN

#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
const unsigned int ALIGN_SPEC=16;
static const unsigned int ALIGN_SPEC=16;
#elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
#else
// Can't use GetAlignmentOf<word32>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=4;
static const unsigned int ALIGN_SPEC=4;
#endif

ANONYMOUS_NAMESPACE_END
Expand Down
6 changes: 3 additions & 3 deletions donna_64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ extern const char DONNA64_FNAME[] = __FILE__;
ANONYMOUS_NAMESPACE_BEGIN

#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
const unsigned int ALIGN_SPEC=16;
static const unsigned int ALIGN_SPEC=16;
#elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64);
static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word64);
#else
// Can't use GetAlignmentOf<word64>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=8;
static const unsigned int ALIGN_SPEC=8;
#endif

ANONYMOUS_NAMESPACE_END
Expand Down
6 changes: 3 additions & 3 deletions salsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
ANONYMOUS_NAMESPACE_BEGIN

#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
const unsigned int ALIGN_SPEC=16;
static const unsigned int ALIGN_SPEC=16;
#elif (CRYPTOPP_CXX11_ALIGNOF)
const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
static const unsigned int ALIGN_SPEC=alignof(CryptoPP::word32);
#else
// Can't use GetAlignmentOf<word32>() because of C++11 constexpr
const unsigned int ALIGN_SPEC=4;
static const unsigned int ALIGN_SPEC=4;
#endif

ANONYMOUS_NAMESPACE_END
Expand Down