Prefix shared SIMD include scaffolding with Hlp to avoid CryptoLib collisions#96
Merged
Merged
Conversation
…llisions
The SIMD prologue/save-restore scaffolding (Include\Simd\Common) and the
CPUID/XGETBV probes (Include\Simd\CpuFeatures) are copied into both this
library and CryptoLib4Pascal and have diverged (they branch on HASHLIB_*
vs CRYPTOLIB_* defines). Exposed under identical names on both packages'
include search path, they trip Lazarus "Duplicate file" warnings and let
FPC's include resolution bind against the wrong library's copy.
Rename the 24 shared files (Common x86_64/i386/aarch64 + CpuFeatures) with
an Hlp prefix so no basename is shared with CryptoLib, updating the {$I}
references and their comment mentions. The CpuIdQuery/XGetBvQuery
procedures keep their names; only the include files are renamed. Paths
stay .pas-relative, so the -Fi depth anchor still resolves and Delphi is
unaffected.
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
1 participant
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.
The SIMD prologue/save-restore scaffolding (Include\Simd\Common) and the CPUID/XGETBV probes (Include\Simd\CpuFeatures) are copied into both this library and CryptoLib4Pascal and have diverged (they branch on HASHLIB_* vs CRYPTOLIB_* defines). Exposed under identical names on both packages' include search path, they trip Lazarus "Duplicate file" warnings and let FPC's include resolution bind against the wrong library's copy.
Rename the 24 shared files (Common x86_64/i386/aarch64 + CpuFeatures) with an Hlp prefix so no basename is shared with CryptoLib, updating the {$I} references and their comment mentions. The CpuIdQuery/XGetBvQuery procedures keep their names; only the include files are renamed. Paths stay .pas-relative, so the -Fi depth anchor still resolves and Delphi is unaffected.