arm64: drop the stale crypto/openssl/aarch64/arm_arch.h copy - #525
Merged
Merged
Conversation
The OpenSSL aarch64 assembly files #include "arm_arch.h", which resolves
to the sibling copy in sys/crypto/openssl/aarch64/ before any -I path.
That copy dates from OpenSSL 1.1 (2018) and lacks the macros the current
3.0 assembly uses, so AARCH64_VALID_CALL_TARGET is left unexpanded and
every arm64 GENERIC build fails:
sys/crypto/openssl/aarch64/aesv8-armx.S:18:2: error: unrecognized instruction mnemonic
Remove the stale copy so the include resolves to the maintained
sys/crypto/openssl/arm_arch.h, add -I$S/crypto/openssl to the aarch64
OpenSSL assembly rules in files.arm64 as FreeBSD does, and repoint the
one C consumer (ossl_aarch64.c) at the surviving header.
Verified: aesv8-armx.o, ghashv8-armx.o, sha1/sha256/sha512-armv8.o,
poly1305-armv8.o, chacha-armv8.o, ossl_aarch64.o, armv8_crypto.o and
armv8_crypto_wrap.o all cross-compile for aarch64 from a GENERIC+ossl
config; the first two fail identically before the change.
AI-Assisted-by: Claude Fable 5.1
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Signed-off-by: Lucas Holt <luke@foolishgames.com>
Reviewer's guide (collapsed on small PRs)Reviewer's GuideRemoves the stale AArch64 OpenSSL header and adjusts C and assembly include paths so all AArch64 consumers resolve the maintained header containing the required call-target macro, fixing native and cross-compiled arm64 builds without changing assembly code. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #523 and #524. With those in, both amd64 Cross-build Kernel jobs are green and both arm64 jobs fail on the next genuine source bug, which also breaks native arm64 GENERIC builds:
The OpenSSL aarch64
.Sfiles#include "arm_arch.h", which resolves to a sibling copy insys/crypto/openssl/aarch64/before any-Ipath. That copy dates from OpenSSL 1.1 (2018) and lacksAARCH64_VALID_CALL_TARGET, so the macro is assembled literally.Removed the stale copy so the maintained
sys/crypto/openssl/arm_arch.his found, added-I$S/crypto/opensslto the aarch64 OpenSSL assembly rules in files.arm64 as FreeBSD does, and repointed the one C consumer (ossl_aarch64.c) at the surviving header. No assembly was modified.Verified locally:
aesv8-armx.o,ghashv8-armx.o,sha1/sha256/sha512-armv8.o,poly1305-armv8.o,chacha-armv8.o,ossl_aarch64.o,armv8_crypto.oandarmv8_crypto_wrap.oall cross-compile for aarch64 from a GENERIC+ossl config; the first two fail identically before the change. This PR's CI run is the end-to-end test for arm64.AI-Assisted-by: Claude Fable 5.1
🤖 Generated with Claude Code
Summary by Sourcery
Fix arm64 OpenSSL compilation by removing the stale architecture-header copy and using the maintained shared header.
Bug Fixes:
Enhancements:
Build:
Tests: