Page MenuHomeFreeBSD

ossl: Move arm_arch.h to a common subdirectory
ClosedPublic

Authored by markj on Dec 1 2023, 3:36 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Sep 18, 2:20 PM
Unknown Object (File)
Thu, Sep 18, 2:19 PM
Unknown Object (File)
Thu, Sep 18, 2:09 PM
Unknown Object (File)
Thu, Sep 18, 2:00 AM
Unknown Object (File)
Tue, Sep 16, 10:40 PM
Unknown Object (File)
Aug 19 2025, 10:42 PM
Unknown Object (File)
Aug 10 2025, 9:13 PM
Unknown Object (File)
Aug 3 2025, 8:14 PM
Subscribers

Details

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 Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj requested review of this revision.Dec 1 2023, 3:36 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

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.

This revision was automatically updated to reflect the committed changes.