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

Validate or define ARM HWCAP2_XXX macros #2164

Merged
merged 2 commits into from
Feb 6, 2025

Conversation

justsmth
Copy link
Contributor

@justsmth justsmth commented Feb 4, 2025

Issues:

Addresses: aws/aws-lc-rs#681

Description of changes:

On some platforms ARM's HWCAP2_XXX macros might be defined in system header files, causing compilation failure due to their being redefined here.

.../aws-lc/crypto/fipsmodule/cpucap/cpu_arm_linux.h:35:9: error: 'HWCAP2_AES' redefined [-Werror]
     35 | #define HWCAP2_AES (1 << 0)
        |         ^~~~~~~~~~
  In file included from .../armv7ve-libreelec-linux-gnueabihf/sysroot/usr/include/bits/hwcap.h:53:9: note: this is the location of the previous definition
     53 | #define HWCAP2_AES              1
        |         ^~~~~~~~~~

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

@codecov-commenter
Copy link

codecov-commenter commented Feb 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.97%. Comparing base (e7bd073) to head (b90400b).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2164   +/-   ##
=======================================
  Coverage   78.97%   78.97%           
=======================================
  Files         611      611           
  Lines      105748   105748           
  Branches    14973    14972    -1     
=======================================
+ Hits        83511    83512    +1     
+ Misses      21583    21582    -1     
  Partials      654      654           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@justsmth justsmth changed the title [DRAFT] Validate or define ARM HWCAP2_XXX macros Validate or define ARM HWCAP2_XXX macros Feb 4, 2025
@justsmth justsmth marked this pull request as ready for review February 4, 2025 20:13
@justsmth justsmth requested a review from a team as a code owner February 4, 2025 20:13
@justsmth justsmth force-pushed the rpi-armv7ve-hw-macros branch from 4aaf4ad to b90400b Compare February 6, 2025 16:38
@justsmth justsmth merged commit d275e08 into aws:main Feb 6, 2025
120 of 126 checks passed
@justsmth justsmth deleted the rpi-armv7ve-hw-macros branch February 6, 2025 19:16
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