kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/mingw-host-cpu' 

Windows update.

* js/mingw-host-cpu:
  mingw: use a more canonical method to fix the CPU reporting
maint
Junio C Hamano 2019-02-13 18:18:43 -08:00
parent feb9a9b202 bb02e7a560
commit 8593e8a618
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compat/mingw.h
View File

@ -6,25 +6,6 @@ typedef _sigset_t sigset_t;
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.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. */ /* MinGW-w64 reports to have flockfile, but it does not actually have it. */
#ifdef __MINGW64_VERSION_MAJOR #ifdef __MINGW64_VERSION_MAJOR
#undef _POSIX_THREAD_SAFE_FUNCTIONS #undef _POSIX_THREAD_SAFE_FUNCTIONS

2
config.mak.uname
View File

@ -574,9 +574,11 @@ else
prefix = /usr/ prefix = /usr/
ifeq (MINGW32,$(MSYSTEM)) ifeq (MINGW32,$(MSYSTEM))
prefix = /mingw32 prefix = /mingw32
HOST_CPU = i686
endif endif
ifeq (MINGW64,$(MSYSTEM)) ifeq (MINGW64,$(MSYSTEM))
prefix = /mingw64 prefix = /mingw64
HOST_CPU = x86_64
else else
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
BASIC_LDFLAGS += -Wl,--large-address-aware BASIC_LDFLAGS += -Wl,--large-address-aware