From: Pierre le Riche Date: Mon, 28 May 2012 07:46:54 +0000 (+0200) Subject: msysgit: Add the --large-address-aware linker directive to the makefile. X-Git-Tag: v1.8.4-rc0~198^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb99070303e8e8af4438c0bad76d459af80d3bba;p=thirdparty%2Fgit.git msysgit: Add the --large-address-aware linker directive to the makefile. This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue #12] Signed-off-by: Pierre le Riche Signed-off-by: Pat Thoyts --- diff --git a/config.mak.uname b/config.mak.uname index e90ad12f90..c5518fe330 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -505,6 +505,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_OBJS += compat/mingw.o compat/winansi.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o + BASIC_LDFLAGS += -Wl,--large-address-aware EXTLIBS += -lws2_32 PTHREAD_LIBS = NATIVE_CRLF = YesPlease