configure: Rename the shared heap segment to avoid a Mac OS linker bug with 16-char names.
This commit is contained in:
parent
e920f5f7d7
commit
691bdbd123
|
@ -7274,7 +7274,7 @@ fi
|
||||||
|
|
||||||
IOKITLIB="-framework IOKit -framework CoreFoundation"
|
IOKITLIB="-framework IOKit -framework CoreFoundation"
|
||||||
|
|
||||||
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"
|
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
|
||||||
|
|
||||||
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
|
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
|
||||||
then
|
then
|
||||||
|
|
|
@ -580,7 +580,7 @@ case $host_os in
|
||||||
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
|
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
|
||||||
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
|
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
|
||||||
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
|
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
|
||||||
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"])
|
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"])
|
||||||
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
|
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
|
||||||
then
|
then
|
||||||
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
|
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
|
||||||
asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000");
|
asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000");
|
||||||
asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x03000000");
|
asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000");
|
||||||
extern char __wine_dos[0x60000000], __wine_shared_heap[0x03000000];
|
extern char __wine_dos[0x60000000], __wine_shared_heap[0x03000000];
|
||||||
|
|
||||||
static const struct wine_preload_info wine_main_preload_info[] =
|
static const struct wine_preload_info wine_main_preload_info[] =
|
||||||
|
|
Loading…
Reference in New Issue