[PATCH] configure: Increase Wine loader address.

[Paul Gofman]

PE ntdll.dll does not fit in 0x7bc00000-0x7c000000 range
with certain builds with debug info.

Signed-off-by: Paul Gofman 
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3c03bad292e..6e6c9da3951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -965,7 +965,7 @@ case $host_os in

WINE_TRY_CFLAGS([-Wl,--export-dynamic],
                       [WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
-      WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000"
+      WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"

WINE_TRY_CFLAGS([-Wl,--rpath,$ORIGIN/../lib],
                       [LDRPATH_INSTALL="-Wl,--rpath,\$$ORIGIN/`$(MAKEDEP) -R ${bindir} ${libdir}`"
@@ -982,12 +982,12 @@ case $host_os in
           WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
                           [case $host_os in
                            freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;
-                           *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7c000000" ;;
+                           *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;;
                            esac],
-                          [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400],
+                          [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400],
                                            [case $host_os in
                                               freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;;
-                                              *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7c000400" ;;
+                                              *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;;
                                            esac])
                            AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
                            if test "x$PRELINK" = xfalse

[Chip Davis]

You forgot to bump the preloader on Mac OS.

Chip

[Paul Gofman]

On 7/1/20 20:38, Chip Davis wrote:
> You forgot to bump the preloader on Mac OS.
>
> Chip

As far as I could see, preloader address was already different for
Macos. Should we bump the address anyway, given the problem I am trying
to solve is not reported for Macos?

[Chip Davis]

July 1, 2020 12:43 PM, "Paul Gofman"  wrote:
> On 7/1/20 20:38, Chip Davis wrote:
> > You forgot to bump the preloader on Mac OS.
> >
> > Chip
>
> As far as I could see, preloader address was already different for
> Macos.

Are you sure? I'm pretty sure it's at 0x7c400000, the same as Linux. The loader proper for some reason does not have a base address.
> Should we bump the address anyway, given the problem I am trying
> to solve is not reported for Macos?

If we're not seeing this problem on macOS, I guess it's probably best to leave it be.

Chip

[Paul Gofman]

On 7/1/20 23:49, Chip Davis wrote:
> July 1, 2020 12:43 PM, "Paul Gofman"  wrote:
>
> Are you sure? I'm pretty sure it's at 0x7c400000, the same as Linux. The loader proper for some reason does not have a base address.

Yes, sorry, I looked at the other platforms. Anyway, it doesn't look
like it is supposed to be the same everywhere.