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

Revert "Trim some redundant Arm feature detection files" #1979

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

knightjoel
Copy link
Contributor

This reverts commit d36bf85.

Issues:

Resolves AWS-LC-496

Description of changes:

d36bf85 was a merge from upstream. BoringSSL removed some 32-bit ARM stuff for OpenBSD, but the merge to aws-lc removed some aarch64 stuff, breaking the build on OpenBSD/arm64 platform (a regression from #962).

Testing:

I can successfully build aws-lc on OpenBSD/arm64 with this PR.

~/aws-lc-obsd-aarch64% cmake --build ./build
[...]
[588/595] Linking CXX executable ssl/test/bssl_shim
ld: warning: ssl_transfer.cc:30 (/home/jwk/aws-lc-obsd-aarch64/ssl/test/ssl_transfer.cc:30)(ssl/test/CMakeFiles/bssl_shim.dir/ssl_transfer.cc.o:(SSLTransfer::ResetSSL(TestConfig const*, std::__1::unique_ptr<ssl_st, bssl::internal::Deleter>*))): warning: rand() may return deterministic values, is that what you want?
[591/595] Linking CXX executable crypto/crypto_testld: warning: bio_md_test.cc:185 (/home/jwk/aws-lc-obsd-aarch64/crypto/pkcs7/bio/bio_md_test.cc:185)(crypto/CMakeFiles/crypto_test.dir/pkcs7/bio/bio_md_test.cc.o:(BIOMessageDigestTest_Randomized_Test::TestBody())): warning: rand() may return deterministic values, is that what you want?
[595/595] Linking CXX executable ssl/ssl_test

~/aws-lc-obsd-aarch64% uname -a
OpenBSD arm64 7.6 GENERIC.MP#196 arm64

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.

@knightjoel knightjoel requested a review from a team as a code owner November 9, 2024 23:58
@codecov-commenter
Copy link

codecov-commenter commented Nov 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.87%. Comparing base (796202b) to head (d4bbbba).
Report is 5 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1979      +/-   ##
==========================================
+ Coverage   78.86%   78.87%   +0.01%     
==========================================
  Files         593      593              
  Lines      101933   101933              
  Branches    14450    14451       +1     
==========================================
+ Hits        80386    80400      +14     
+ Misses      20903    20890      -13     
+ Partials      644      643       -1     

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

While here, rotate the OpenBSD versions to keep up with the latest
release (OpenBSD support model is N and N-1).
There's no tag which supports OpenBSD 7.6, so pinning to the latest
commit for now.
Copy link
Contributor

@torben-hansen torben-hansen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like d36bf85 removed cpu_aarch64_openbsd.c that handles the 64-bit stuff. While it should have removed cpu_arm_openbsd.c that handles the 32-bit stuff, except this file doesn't exist in AWS-LC (a difference from BoringSSL).

Now see CryptoAlg-2781

Copy link
Contributor

@torben-hansen torben-hansen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, looks like there are some test setup to work through before PR is ready to merge.

But the revert part lgtm.

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