summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Pierre le Riche <github@pleasedontspam.me>2012-05-28 09:46:54 +0200
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2013-06-04 10:02:41 +0100
commitfb99070303e8e8af4438c0bad76d459af80d3bba (patch)
tree58a409e00a3aaa78b1a624df93dd561d34e2690b
parentDefine NO_GETTEXT for Git for Windows (diff)
downloadtgif-fb99070303e8e8af4438c0bad76d459af80d3bba.tar.xz
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 <github@pleasedontspam.me> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rw-r--r--config.mak.uname1
1 files changed, 1 insertions, 0 deletions
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