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.

Sign up for GitHub

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

Some clangarm64 fixes #5439

Merged
merged 8 commits into from
Feb 26, 2025
Merged

Some clangarm64 fixes #5439

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87ce6a0
fixup! mingw: add a cache below mingw's lstat and dirent implementations
dscho Feb 25, 2025
46fe8c9
fixup! fscache: implement an FSCache-aware is_mount_point()
dscho Feb 25, 2025
0c5dcab
msvc: do handle builds on Windows/ARM64
dscho Feb 25, 2025
8c92887
mingw(arm64): do move the `/etc/git*` location
dscho Feb 25, 2025
e2874e2
fixup! config.mak.uname: add support for clangarm64
dscho Feb 25, 2025
d5953d8
fixup! mingw: add a Makefile target to copy test artifacts
dscho Feb 25, 2025
56c4f54
fixup! 87ce6a064bc2a8df6d5fff26f09219420e03ab23
dscho Feb 25, 2025
d16eadf
fixup! 46fe8c94075bd98d637be8777209edfcac8566b5
dscho Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions compat/win32/fscache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,15 @@
};
#pragma GCC diagnostic pop

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wflexible-array-extensions"

Check failure on line 82 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:82:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]

Check failure on line 82 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:82:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
struct heap_fsentry {
union {
struct fsentry ent;
char dummy[sizeof(struct fsentry) + MAX_LONG_PATH];
} u;
};
#pragma GCC diagnostic pop

/*
* Compares the paths of two fsentry structures for equality.
Expand Down Expand Up @@ -596,7 +599,10 @@
int fscache_lstat(const char *filename, struct stat *st)
{
int dirlen, base, len;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wflexible-array-extensions"

Check failure on line 603 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:603:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]

Check failure on line 603 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:603:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
struct heap_fsentry key[2];
#pragma GCC diagnostic pop
struct fsentry *fse;
struct fscache *cache = fscache_getcache();

Expand Down Expand Up @@ -659,7 +665,10 @@
int fscache_is_mount_point(struct strbuf *path)
{
int dirlen, base, len;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wflexible-array-extensions"

Check failure on line 669 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:669:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]

Check failure on line 669 in compat/win32/fscache.c

View workflow job for this annotation

GitHub Actions / win build 

compat/win32/fscache.c:669:32: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
struct heap_fsentry key[2];
#pragma GCC diagnostic pop
struct fsentry *fse;
struct fscache *cache = fscache_getcache();

Expand Down
20 changes: 9 additions & 11 deletions config.mak.uname
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,11 @@ ifeq ($(uname_S),Windows)
ifeq (MINGW32,$(MSYSTEM))
prefix = /mingw32
else
prefix = /mingw64
ifeq (CLANGARM64,$(MSYSTEM))
prefix = /clangarm64
else
prefix = /mingw64
endif
endif
# Prepend MSVC 64-bit tool-chain to PATH.
#
Expand Down Expand Up @@ -486,7 +490,7 @@ ifeq ($(uname_S),Windows)
NATIVE_CRLF = YesPlease
DEFAULT_HELP_FORMAT = html
SKIP_DASHED_BUILT_INS = YabbaDabbaDoo
ifeq (/mingw64,$(subst 32,64,$(prefix)))
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes
Expand Down Expand Up @@ -724,8 +728,7 @@ ifeq ($(uname_S),MINGW)
prefix = /mingw32
HOST_CPU = i686
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
endif
ifeq (MINGW64,$(MSYSTEM))
else ifeq (MINGW64,$(MSYSTEM))
prefix = /mingw64
HOST_CPU = x86_64
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
Expand All @@ -749,17 +752,12 @@ ifeq ($(uname_S),MINGW)
USE_LIBPCRE = YesPlease
USE_MIMALLOC = YesPlease
NO_PYTHON =
ifeq (/mingw64,$(subst 32,64,$(prefix)))
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes
endif
ifeq (i686,$(uname_M))
MINGW_PREFIX := mingw32
endif
ifeq (x86_64,$(uname_M))
MINGW_PREFIX := mingw64
endif
MINGW_PREFIX := $(subst /,,$(prefix))

DESTDIR_WINDOWS = $(shell cygpath -aw '$(DESTDIR_SQ)')
DESTDIR_MIXED = $(shell cygpath -am '$(DESTDIR_SQ)')
Expand Down
Loading