From 67aeaded2f8dabe16b4879261c6b6ddda6b53cd2 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 12 Oct 2018 20:11:27 +0000 Subject: [PATCH] introduce --enable-large-address-aware Add a configure knob for mingw32 and 64 toolchains to default passing --large-address-aware to the linker, when creating 32-bit binaries. -Wl,--disable-large-address-aware can still reverse its effects. for gcc/ChangeLog * configure.ac: Introduce --enable-large-address-aware to define MINGW_DEFAULT_LARGE_ADDR_AWARE. * doc/install.texi: Document it. * configure, config.in: Rebuilt. * config/i386/mingw32.h (LINK_SPEC_LARGE_ADDR_AWARE): Define, based on MINGW_DEFAULT_LARGE_ADDR_AWARE. (LINK_SPEC): Insert it. * config/i386/mingw-264.h: Likewise. From-SVN: r265130 --- gcc/ChangeLog | 9 +++++++++ gcc/config.in | 12 ++++++++++++ gcc/config/i386/mingw-w64.h | 9 +++++++++ gcc/config/i386/mingw32.h | 8 ++++++++ gcc/configure | 18 ++++++++++++++++-- gcc/configure.ac | 7 +++++++ gcc/doc/install.texi | 8 ++++++++ 7 files changed, 69 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc6efa74e23..1cc85d8f23e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,14 @@ 2018-10-12 Alexandre Oliva + * configure.ac: Introduce --enable-large-address-aware + to define MINGW_DEFAULT_LARGE_ADDR_AWARE. + * doc/install.texi: Document it. + * configure, config.in: Rebuilt. + * config/i386/mingw32.h (LINK_SPEC_LARGE_ADDR_AWARE): Define, + based on MINGW_DEFAULT_LARGE_ADDR_AWARE. + (LINK_SPEC): Insert it. + * config/i386/mingw-264.h: Likewise. + * cygming.h (HAVE_GAS_ALIGNED_COMM): Fallback-define. 2018-10-12 Peter Bergner diff --git a/gcc/config.in b/gcc/config.in index d7c3fbfd9b2..b807d49712e 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1993,6 +1993,18 @@ #endif +/* Define if we should link with --large-address-aware by default */ +#ifndef USED_FOR_TARGET +#undef MINGW_DEFAULT_LARGE_ADDR_AWARE +#endif + + +/* Define if we should link with --large-address-aware by default */ +#ifndef USED_FOR_TARGET +#undef MINGW_DEFAULT_LARGE_ADDR_AWARE +#endif + + /* Value to set mingw's _dowildcard to. */ #ifndef USED_FOR_TARGET #undef MINGW_DOWILDCARD diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h index 484dc7a9e9f..00b3f042a36 100644 --- a/gcc/config/i386/mingw-w64.h +++ b/gcc/config/i386/mingw-w64.h @@ -81,6 +81,14 @@ along with GCC; see the file COPYING3. If not see #define MULTILIB_DEFAULTS { "m32" } #endif +#undef LINK_SPEC_LARGE_ADDR_AWARE +#if MINGW_DEFAULT_LARGE_ADDR_AWARE +# define LINK_SPEC_LARGE_ADDR_AWARE \ + "%{!shared:%{!mdll:%{" SPEC_32 ":--large-address-aware}}}" +#else +# define LINK_SPEC_LARGE_ADDR_AWARE "" +#endif + #undef LINK_SPEC #define LINK_SPEC SUB_LINK_SPEC " %{mwindows:--subsystem windows} \ %{mconsole:--subsystem console} \ @@ -88,4 +96,5 @@ along with GCC; see the file COPYING3. If not see %{shared: --shared} %{mdll:--dll} \ %{static:-Bstatic} %{!static:-Bdynamic} \ %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ + " LINK_SPEC_LARGE_ADDR_AWARE "\ %(shared_libgcc_undefs)" diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index a6601089420..c9d8a7a31f3 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -114,12 +114,20 @@ along with GCC; see the file COPYING3. If not see #define SUBTARGET_EXTRA_SPECS \ { "shared_libgcc_undefs", SHARED_LIBGCC_UNDEFS_SPEC } +#if MINGW_DEFAULT_LARGE_ADDR_AWARE +# define LINK_SPEC_LARGE_ADDR_AWARE \ + "%{!shared:%{!mdll:--large-address-aware}}" +#else +# define LINK_SPEC_LARGE_ADDR_AWARE "" +#endif + #define LINK_SPEC "%{mwindows:--subsystem windows} \ %{mconsole:--subsystem console} \ %{shared: %{mdll: %eshared and mdll are not compatible}} \ %{shared: --shared} %{mdll:--dll} \ %{static:-Bstatic} %{!static:-Bdynamic} \ %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ + " LINK_SPEC_LARGE_ADDR_AWARE "\ %(shared_libgcc_undefs)" /* Include in the mingw32 libraries with libgcc */ diff --git a/gcc/configure b/gcc/configure index 3e33a69628b..563860181a1 100755 --- a/gcc/configure +++ b/gcc/configure @@ -928,6 +928,7 @@ enable_sjlj_exceptions with_gcc_major_version_only enable_secureplt enable_mingw_wildcard +enable_large_address_aware enable_leading_mingw64_underscores enable_cld enable_frame_pointer @@ -1645,6 +1646,8 @@ Optional Features: --enable-secureplt enable -msecure-plt by default for PowerPC --enable-mingw-wildcard Set whether to expand wildcard on command-line. Default to platform configuration + --enable-large-address-aware + Link mingw executables with --large-address-aware --enable-leading-mingw64-underscores enable leading underscores on 64 bit mingw targets --enable-cld enable -mcld by default for 32bit x86 @@ -12037,6 +12040,17 @@ _ACEOF fi +# Check whether --enable-large-address-aware was given. +if test "${enable_large_address_aware+set}" = set; then : + enableval=$enable_large_address_aware; +fi + +if test x"$enable_large_address_aware" = xyes; then : + +$as_echo "#define MINGW_DEFAULT_LARGE_ADDR_AWARE 1" >>confdefs.h + +fi + # Check whether --enable-leading-mingw64-underscores was given. if test "${enable_leading_mingw64_underscores+set}" = set; then : enableval=$enable_leading_mingw64_underscores; @@ -18495,7 +18509,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18498 "configure" +#line 18512 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18601,7 +18615,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18604 "configure" +#line 18618 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index ff6444a0f9b..c5c33af374c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1852,6 +1852,13 @@ AS_IF([test x"$enable_mingw_wildcard" != xplatform ], $(test x"$enable_mingw_wildcard" = xno; echo $?), [Value to set mingw's _dowildcard to.])]) +AC_ARG_ENABLE(large-address-aware, +[AS_HELP_STRING([--enable-large-address-aware], + [Link mingw executables with --large-address-aware])]) +AS_IF([test x"$enable_large_address_aware" = xyes], + [AC_DEFINE([MINGW_DEFAULT_LARGE_ADDR_AWARE], 1, + [Define if we should link mingw executables with --large-address-aware])]) + AC_ARG_ENABLE(leading-mingw64-underscores, AS_HELP_STRING([--enable-leading-mingw64-underscores], [enable leading underscores on 64 bit mingw targets]), diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 93022517b31..6dd21bb915e 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1734,6 +1734,14 @@ Using the GNU Compiler Collection (GCC)}, See ``i386 and x86-64 Options'' in the main manual @end ifhtml +@item --enable-large-address-aware +The @option{--enable-large-address-aware} option arranges for MinGW +executables to be linked using the @option{--large-address-aware} +option, that enables the use of more than 2GB of memory. If GCC is +configured with this option, its effects can be reversed by passing the +@option{-Wl,--disable-large-address-aware} option to the so-configured +compiler driver. + @item --enable-win32-registry @itemx --enable-win32-registry=@var{key} @itemx --disable-win32-registry -- 2.30.2