summaryrefslogtreecommitdiff
path: root/compat/mingw.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-09 04:44:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-09 04:44:53 (GMT)
commit6951c5fd9fc221520b80de1da340918887f5803b (patch)
treef36bee25bcb4b413a47194832743853ed2ba17a9 /compat/mingw.h
parent8f6399eceec47de2887a621ca6ee01a3ef8b3f56 (diff)
parent3815f64b0dd983bdbf9242a0547706d5d81cb3e6 (diff)
downloadgit-6951c5fd9fc221520b80de1da340918887f5803b.zip
git-6951c5fd9fc221520b80de1da340918887f5803b.tar.gz
git-6951c5fd9fc221520b80de1da340918887f5803b.tar.bz2
Merge branch 'js/mingw-host-cpu'
Windows update. * js/mingw-host-cpu: mingw: fix CPU reporting in `git version --build-options`
Diffstat (limited to 'compat/mingw.h')
-rw-r--r--compat/mingw.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 30d9fb3..9840774 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -6,6 +6,25 @@ typedef _sigset_t sigset_t;
#include <winsock2.h>
#include <ws2tcpip.h>
+#ifdef __MINGW64_VERSION_MAJOR
+/*
+ * In Git for Windows, we cannot rely on `uname -m` to report the correct
+ * architecture: /usr/bin/uname.exe will report the architecture with which the
+ * current MSYS2 runtime was built, not the architecture for which we are
+ * currently compiling (both 32-bit and 64-bit `git.exe` is built in the 64-bit
+ * Git for Windows SDK).
+ */
+#undef GIT_HOST_CPU
+/* This was figured out by looking at `cpp -dM </dev/null`'s output */
+#if defined(__x86_64__)
+#define GIT_HOST_CPU "x86_64"
+#elif defined(__i686__)
+#define GIT_HOST_CPU "i686"
+#else
+#error "Unknown architecture"
+#endif
+#endif
+
/* MinGW-w64 reports to have flockfile, but it does not actually have it. */
#ifdef __MINGW64_VERSION_MAJOR
#undef _POSIX_THREAD_SAFE_FUNCTIONS