Use a more canonical method to fix the CPU reporting on Windows
cover Use a more canonical method to fix the CPU reporting on Windows
Eric Sunshine pointed out that I had completely forgotten about the HOST_CPU thing, and that is indeed the much better method of fixing the issue.
Johannes Schindelin (1):
mingw: use a more canonical method to fix the CPU reporting
compat/mingw.h | 19 ------------------- config.mak.uname | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-)
base-commit: 3815f64b0dd983bdbf9242a0547706d5d81cb3e6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-125%2Fdscho%2Fmingw-host-cpu-take2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-125/dscho/mingw-host-cpu-take2-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/125
Signature · 1 line
gitgitgadget
PATCH 1/1 mingw: use a more canonical method to fix the CPU reporting
From: Johannes Schindelin <[email protected]>
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.
--- compat/mingw.h | 19 ------------------- config.mak.uname | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-)
compat/mingw.h +0 -19
@@ -6,25 +6,6 @@ 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
config.mak.uname +2 -0
@@ -553,9 +553,11 @@ else prefix = /usr/ ifeq (MINGW32,$(MSYSTEM)) prefix = /mingw32 + HOST_CPU = i686 endif ifeq (MINGW64,$(MSYSTEM)) prefix = /mingw64 + HOST_CPU = x86_64 else COMPAT_CFLAGS += -D_USE_32BIT_TIME_T BASIC_LDFLAGS += -Wl,--large-address-aware
Signature · 1 line
gitgitgadget
Re: [PATCH 1/1] mingw: use a more canonical method to fix the CPU reporting
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 15 lines · writes:
From: Johannes Schindelin <[email protected]>
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 ingit 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
MakefilevariableHOST_CPUexplicitly for cross-compiled Git. So let's do that!
Quoted 7 lines
This reverts commit
3815f64b0dd983bdbf9242a0547706d5d81cb3e6partially.Signed-off-by Johannes Schindelin <[email protected]>--- compat/mingw.h | 19 ------------------- config.mak.uname | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-)
Will apply; thanks.
Quoted 47 lines
compat/mingw.h +0
-19@@ -6,25 +6,6 @@ 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_FUNCTIONSconfig.mak.uname +2
-0@@ -553,9 +553,11 @@ else prefix = /usr/ ifeq (MINGW32,$(MSYSTEM)) prefix = /mingw32 + HOST_CPU = i686 endif ifeq (MINGW64,$(MSYSTEM)) prefix = /mingw64 + HOST_CPU = x86_64 else COMPAT_CFLAGS += -D_USE_32BIT_TIME_T BASIC_LDFLAGS += -Wl,--large-address-aware