Some clangarm64 fixes
#5439
Merged
Some clangarm64 fixes
#5439
Conversation
This file contains 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
Clang has newly developed an antipathy for unions and arrays of structs that contain flex arrays... Let's just pat clang's head and move on. Signed-off-by: Johannes Schindelin <[email protected]>
This is needed because clang now complains about arrays of structs that contain flex array members. Signed-off-by: Johannes Schindelin <[email protected]>
Git for Windows/ARM64 settled on using `clang` to compile `git.exe`, and hence needs to run in a system where `MSYSTEM` is set to `CLANGARM64` and the prefix to use is `/clangarm64`. We already did that in the `MINGW` arm, i.e. for regular Git for Windows builds using MINGW GCC (or `clang`'s shim pretending to be GCC), now it is time to do the same in the MS Visual C part. Signed-off-by: Johannes Schindelin <[email protected]>
In fb5e337 (mingw: move Git for Windows' system config where users expect it, 2021-06-22), I moved the location of Git for Windows' system config and system Git attributes file to the top-level `/etc/` directory (because it is a much more obvious location than, say, `/mingw64/etc/`). The patch relied on a very specific scenario that the newly-supported Windows/ARM64 builds of `git.exe` fails to fall into. So let's broaden the condition a bit, so that Windows/ARM64 builds also use that location (instead of the even more obscure `/clangarm64/etc/` directory). This fixes #5431. Signed-off-by: Johannes Schindelin <[email protected]>
This commit introduced an `else ifeq` pattern that is arguably more elegant than the previous pattern, so let's adjust the existing conditional block, too. Signed-off-by: Johannes Schindelin <[email protected]>
This makes the code a bit less fragile by being less dependent on multiple adjustments for any new `MSYSTEM` value. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
requested review from
jeremyd2019,
mjcheetham,
rimrul and
dennisameling
mjcheetham
approved these changes
Feb 25, 2025
This needs to be guarded against GCC complaining that it does not know this option... _sigh_ Signed-off-by: Johannes Schindelin <[email protected]>
This needs to be guarded against GCC complaining that it does not know this option... _sigh_ Signed-off-by: Johannes Schindelin <[email protected]>
jeremyd2019
reviewed
Feb 25, 2025
git-for-windows-ci
pushed a commit
that referenced
this pull request
Feb 26, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
git-for-windows-ci
pushed a commit
that referenced
this pull request
Feb 26, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
git-for-windows-ci
pushed a commit
that referenced
this pull request
Feb 26, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
git-for-windows-ci
pushed a commit
that referenced
this pull request
Feb 26, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
dscho
added a commit
that referenced
this pull request
Feb 26, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
git-for-windows-ci
pushed a commit
that referenced
this pull request
Mar 4, 2025
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
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.
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use
/etc/gitconfigby mistake, but/clangarm64/etc/gitconfiginstead.My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.