diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-23 07:00:24 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-23 07:00:24 -0800 |
| commit | 5a4af8f71f527fc7902860aeb0e1b013e0368336 (patch) | |
| tree | 1cc2e7345b74dbb91622552c24fe688b2819bc46 | |
| parent | a337505bd7d0791fa1123c600ea9295cafa678b3 (diff) | |
| parent | 1f0ce2dd68313094af7cf6647bdf5936bee8352c (diff) | |
Merge pull request #2167 from Diapolo/Qt_laa_flag
enable GCC large address aware linker flag (Windows only)
| -rw-r--r-- | bitcoin-qt.pro | 2 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 3 | ||||
| -rw-r--r-- | src/makefile.mingw | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 6a2d7092c2..5274de4265 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -44,6 +44,8 @@ QMAKE_LFLAGS *= -fstack-protector-all QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now # for extra security on Windows: enable ASLR and DEP via GCC linker flags win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat +# on Windows: enable GCC large address aware linker flag +win32:QMAKE_LFLAGS *= -Wl,--large-address-aware # use: qmake "USE_QRCODE=1" # libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index ff565f2a2d..efbce1f047 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -33,7 +33,8 @@ LIBS= \ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat +# enable: ASLR, DEP and large address aware +LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) diff --git a/src/makefile.mingw b/src/makefile.mingw index 9a6680bf40..a7a57a2a24 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -28,7 +28,8 @@ LIBS= \ DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat +# enable: ASLR, DEP and large address aware +LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) |