Alexandre Julliard : makefiles: Move the main loader base address to cope with huge page alignment.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1df3955467edb13c1cf6929ac55f29fd91b0eecc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1df3955467edb13c1cf6929ac5...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Mar 28 16:34:28 2016 +0900

makefiles: Move the main loader base address to cope with huge page alignment.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure    | 22 +++++++++++-----------
 configure.ac |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 5d99f47..764ac45 100755
--- a/configure
+++ b/configure
@@ -8575,35 +8575,35 @@ $as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; }
 if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then :
   case $host_os in
                            freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;;
-                           *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;;
+                           *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;;
                            esac
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5
-$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; }
-if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400" >&5
+$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400... " >&6; }
+if ${ac_cv_cflags__Wl___section_start__interp_0x7c000400+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400"
+CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7c000400"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(int argc, char **argv) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes
+  ac_cv_cflags__Wl___section_start__interp_0x7c000400=yes
 else
-  ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no
+  ac_cv_cflags__Wl___section_start__interp_0x7c000400=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 CFLAGS=$ac_wine_try_cflags_saved
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5
-$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; }
-if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&5
+$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&6; }
+if test "x$ac_cv_cflags__Wl___section_start__interp_0x7c000400" = xyes; then :
   case $host_os in
                                               freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;;
-                                              *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;;
+                                              *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;;
                                            esac
 fi
                            # Extract the first word of "prelink", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
index dd7571d..f63dd61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,12 +898,12 @@ case $host_os in
           WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
                           [case $host_os in
                            freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;;
-                           *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;;
+                           *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;;
                            esac],
-                          [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],
+                          [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400],
                                            [case $host_os in
                                               freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;;
-                                              *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;;
+                                              *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;;
                                            esac])
                            AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
                            if test "x$PRELINK" = xfalse