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

Ensure there's only one copy of OPENSSL_armcap_P in libcrypto.a #20621

Conversation

tom-cosgrove-arm
Copy link
Contributor

Checklist

(none applicable)

Change-Id: Ia94e528a2d55934435de6a2949784c52eb38d82f
@tom-cosgrove-arm tom-cosgrove-arm added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: bug The issue/pr is/fixes a bug tests: present The PR has suitable tests present labels Mar 28, 2023
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Mar 28, 2023
@t8m t8m removed the approval: otc review pending This pull request needs review by an OTC member label Mar 28, 2023
@mattcaswell mattcaswell added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Mar 28, 2023
@anthony-linaro
Copy link
Contributor

Hi All, just FYI, this PR also (inadvertently) fixes Windows ARM64 builds, which were broken by the commit that introduced the ifdef initially (MSVC specifies the define for aarch64 platforms as _M_ARM64 rather than __aarch64__), causing compilation errors when using assembly: https://gitlab.com/Linaro/windowsonarm/packages/openssl/-/jobs/4009474777

Do we know when it will be merged?

@t8m
Copy link
Member

t8m commented Mar 29, 2023

Merged to master branch. Thank you.

@t8m t8m closed this Mar 29, 2023
openssl-machine pushed a commit that referenced this pull request Mar 29, 2023
Change-Id: Ia94e528a2d55934435de6a2949784c52eb38d82f

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #20621)
@tom-cosgrove-arm tom-cosgrove-arm deleted the armcap_p-there-can-be-only-one branch March 29, 2023 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch severity: fips change The pull request changes FIPS provider sources tests: present The PR has suitable tests present triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants