Skip to content

W
wine-cw
Commit 5729f58b authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Move the loader a bit higher in memory to leave more space for ntdll

and kernel32.
parent 03cc8c41
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
configure
View file @ 5729f58b
...@@ -13867,13 +13867,13 @@ echo "${ECHO_T}$ac_cv_c_export_dynamic" >&6 ...@@ -13867,13 +13867,13 @@ echo "${ECHO_T}$ac_cv_c_export_dynamic" >&6
case $host_cpu in case $host_cpu in
*i[3456789]86*) *i[3456789]86*)
echo "$as_me:$LINENO: checking whether we can relocate the executable to 0x77f00000" >&5 echo "$as_me:$LINENO: checking whether we can relocate the executable to 0x7bf00000" >&5
echo $ECHO_N "checking whether we can relocate the executable to 0x77f00000... $ECHO_C" >&6 echo $ECHO_N "checking whether we can relocate the executable to 0x7bf00000... $ECHO_C" >&6
if test "${ac_cv_ld_reloc_exec+set}" = set; then if test "${ac_cv_ld_reloc_exec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x77f00400" CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
...@@ -13925,7 +13925,7 @@ echo "$as_me:$LINENO: result: $ac_cv_ld_reloc_exec" >&5 ...@@ -13925,7 +13925,7 @@ echo "$as_me:$LINENO: result: $ac_cv_ld_reloc_exec" >&5
echo "${ECHO_T}$ac_cv_ld_reloc_exec" >&6 echo "${ECHO_T}$ac_cv_ld_reloc_exec" >&6
if test "$ac_cv_ld_reloc_exec" = "yes" if test "$ac_cv_ld_reloc_exec" = "yes"
then then
LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x77f00400" LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
fi fi
;; ;;
esac esac
......
configure.ac
View file @ 5729f58b
...@@ -991,12 +991,12 @@ case $host_os in ...@@ -991,12 +991,12 @@ case $host_os in
case $host_cpu in case $host_cpu in
*i[[3456789]]86*) *i[[3456789]]86*)
AC_CACHE_CHECK([whether we can relocate the executable to 0x77f00000], ac_cv_ld_reloc_exec, AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,
[WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x77f00400], [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],
ac_cv_ld_reloc_exec="yes", ac_cv_ld_reloc_exec="no")]) ac_cv_ld_reloc_exec="yes", ac_cv_ld_reloc_exec="no")])
if test "$ac_cv_ld_reloc_exec" = "yes" if test "$ac_cv_ld_reloc_exec" = "yes"
then then
LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x77f00400" LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"
fi fi
;; ;;
esac esac
......
loader/Makefile.in
View file @ 5729f58b
...@@ -30,7 +30,7 @@ wine-glibc: glibc.o Makefile.in ...@@ -30,7 +30,7 @@ wine-glibc: glibc.o Makefile.in
$(CC) -o $@ glibc.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(CC) -o $@ glibc.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
wine-preloader: preloader.o Makefile.in wine-preloader: preloader.o Makefile.in
$(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x78000000 preloader.o $(LIBPORT) $(LDFLAGS) $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS)
wine-kthread: $(KTHREAD_OBJS) Makefile.in wine-kthread: $(KTHREAD_OBJS) Makefile.in
$(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment