mingw: use a more canonical method to fix the CPU reporting

In `git version --build-options`, we report also the CPU, but in Git for Windows we actually cross-compile the 32-bit version in a 64-bit Git for Windows, so we cannot rely on the auto-detected value. In 3815f64b0dd9 (mingw: fix CPU reporting in `git version --build-options`, 2019-02-07), we fixed this by a Windows-only workaround, making use of magic pre-processor constants, which works in GCC, but most likely not all C compilers. As pointed out by Eric Sunshine, there is a better way, anyway: to set the Makefile variable HOST_CPU explicitly for cross-compiled Git. So let's do that! This reverts commit 3815f64b0dd983bdbf9242a0547706d5d81cb3e6 partially. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Feb 13, 2019 at 02:19 UTC bb02e7a560de818eac48344717bc52ca51b01908
2 files changed +2 -19
compat/mingw.h
-19
@@ -6,25 +6,6 @@ typedef _sigset_t sigset_t;
6 #include <winsock2.h>
7 #include <ws2tcpip.h>
8
9 -#ifdef __MINGW64_VERSION_MAJOR
10 -/*
11 - * In Git for Windows, we cannot rely on `uname -m` to report the correct
12 - * architecture: /usr/bin/uname.exe will report the architecture with which the
13 - * current MSYS2 runtime was built, not the architecture for which we are
14 - * currently compiling (both 32-bit and 64-bit `git.exe` is built in the 64-bit
15 - * Git for Windows SDK).
16 - */
17 -#undef GIT_HOST_CPU
18 -/* This was figured out by looking at `cpp -dM </dev/null`'s output */
19 -#if defined(__x86_64__)
20 -#define GIT_HOST_CPU "x86_64"
21 -#elif defined(__i686__)
22 -#define GIT_HOST_CPU "i686"
23 -#else
24 -#error "Unknown architecture"
25 -#endif
26 -#endif
27 -
9 /* MinGW-w64 reports to have flockfile, but it does not actually have it. */
10 #ifdef __MINGW64_VERSION_MAJOR
11 #undef _POSIX_THREAD_SAFE_FUNCTIONS
config.mak.uname
+2
@@ -553,9 +553,11 @@ else
553 prefix = /usr/
554 ifeq (MINGW32,$(MSYSTEM))
555 prefix = /mingw32
556 + HOST_CPU = i686
557 endif
558 ifeq (MINGW64,$(MSYSTEM))
559 prefix = /mingw64
560 + HOST_CPU = x86_64
561 else
562 COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
563 BASIC_LDFLAGS += -Wl,--large-address-aware