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.

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

Expand ARCH check to use CMAKE_SIZEOF_VOID_P for x86 and x86_64 #98

Merged
merged 3 commits into from
Feb 23, 2021

Conversation

andrew-kaufman
Copy link
Contributor

Issues:

Resolves: CryptoAlg-671

Description of changes:

When integrating with aws-c-cal in this PR, aws-lc fails to build in a 32-bit container running on a 64-bit host. This is because CMAKE_SYSTEM_PROCESSOR returns the architecture of the host and, as a result, assembly files meant for 64-bit were being included. This expands to check CMAKE_SIZEOF_VOID_P for either x86 or x86_64 and update ARCH accordingly.

Call-outs:

We do not currently have a dimension in our CI that tests this behavior, but this will be added in the work for CryptoAlg-663.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

justinboswell
justinboswell previously approved these changes Feb 23, 2021
CMakeLists.txt Outdated Show resolved Hide resolved
@bryce-shang bryce-shang self-requested a review February 23, 2021 21:47
@andrew-kaufman andrew-kaufman merged commit 7d69e13 into aws:main Feb 23, 2021
@andrew-kaufman andrew-kaufman deleted the arch-checks branch February 23, 2021 23:19
torben-hansen pushed a commit to torben-hansen/aws-lc that referenced this pull request Sep 18, 2024
…er_mscv

Replace static array qualifier with macro that maps to nothing if it detects an msvc compiler
s2n-bignum original commit: awslabs/s2n-bignum@9e60dfc
torben-hansen pushed a commit to torben-hansen/aws-lc that referenced this pull request Sep 18, 2024
…er_mscv

Replace static array qualifier with macro that maps to nothing if it detects an msvc compiler
s2n-bignum original commit: awslabs/s2n-bignum@9e60dfc

s2n-bignum original commit: awslabs/s2n-bignum@0308bfc
torben-hansen pushed a commit to torben-hansen/aws-lc that referenced this pull request Sep 19, 2024
…er_mscv

Replace static array qualifier with macro that maps to nothing if it detects an msvc compiler
s2n-bignum original commit: awslabs/s2n-bignum@9e60dfc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants