ossl: Move arm_arch.h to a common subdirectory
ClosedPublic
Actions

Authored by markj on Dec 1 2023, 3:36 PM.

Details

Reviewers

jrtc27
jhb
andrew

Commits

rG0b9dffed30ba: ossl: Move arm_arch.h to a common subdirectory
rGe655cc70dfcd: ossl: Move arm_arch.h to a common subdirectory

Summary

OpenSSL itself keeps only a single copy of this header. Do the same in
sys/crypto/openssl to avoid the extra maintenance burden. This requires
adjusting the include paths for generated asm files.

No functional change intended.

Reported by: jrtc27

Test Plan

buildworld+buildkernel for arm and arm64

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 54732
Build 51621: arc lint + arc unit

Event Timeline

markj created this revision.Dec 1 2023, 3:36 PM

Herald added a reviewer: andrew. · View Herald TranscriptDec 1 2023, 3:36 PM

Herald added a reviewer: andrew. · View Herald Transcript

Herald added subscribers: emaste, imp. · View Herald Transcript

markj requested review of this revision.Dec 1 2023, 3:36 PM

Harbormaster completed remote builds in B54732: Diff 130903.Dec 1 2023, 3:36 PM

markj edited the test plan for this revision. (Show Details)Dec 1 2023, 3:38 PM

Do we need to update make buildasm in secure/lib/libcrypto? It updates arm_arch.h from the imported OpenSSL.

Fix the arm64 buildasm target, have buildasm update arm_arch.h for arm as well

Harbormaster completed remote builds in B54734: Diff 130906.Dec 1 2023, 4:17 PM

In D42866#977720, @andrew wrote:

Do we need to update make buildasm in secure/lib/libcrypto? It updates arm_arch.h from the imported OpenSSL.

Yes, thanks.

I would perhaps be tempted to leave the header in arm/ and have aarch64 include it from there. It is true that upstream doesn't have it in a subdirectory, but upstream doesn't use platform-specific subdirectories for its assembly files at all.

This revision is now accepted and ready to land.Dec 1 2023, 8:51 PM

In D42866#977839, @jhb wrote:

I would perhaps be tempted to leave the header in arm/ and have aarch64 include it from there. It is true that upstream doesn't have it in a subdirectory, but upstream doesn't use platform-specific subdirectories for its assembly files at all.

I don't have a strong feeling either way. One weak argument for doing it this way: when it comes time to remove 32-bit arm support from the tree, whenever that is, the person doing it won't have to fixup ossl/aarch64.

Closed by commit rGe655cc70dfcd: ossl: Move arm_arch.h to a common subdirectory (authored by markj). · Explain WhyDec 4 2023, 5:50 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGe655cc70dfcd: ossl: Move arm_arch.h to a common subdirectory.

markj added a commit: rG0b9dffed30ba: ossl: Move arm_arch.h to a common subdirectory.Mar 29 2024, 6:15 PM