Charles Davis : loader: On Mac OS with Clang, don' t use external symbols for the DOS and shared heap segments.
Alexandre Julliard
julliard at winehq.org
Fri Sep 21 14:22:39 CDT 2012
Module: wine
Branch: master
Commit: b51c2ba9f74c18268eedf6597b9c4e914abacd07
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51c2ba9f74c18268eedf6597b9c4e914abacd07
Author: Charles Davis <cdavis5x at gmail.com>
Date: Fri Sep 21 01:51:34 2012 -0600
loader: On Mac OS with Clang, don't use external symbols for the DOS and shared heap segments.
---
loader/main.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/loader/main.c b/loader/main.c
index edbf4f7..74a8eb8 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -43,9 +43,16 @@
#ifdef __APPLE__
+#ifndef __clang__
__asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000");
__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000");
extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000];
+#else
+__asm__(".zerofill WINE_DOS, WINE_DOS");
+__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP");
+static char __wine_dos[0x40000000] __attribute__((section("WINE_DOS, WINE_DOS")));
+static char __wine_shared_heap[0x03000000] __attribute__((section("WINE_SHAREDHEAP, WINE_SHAREDHEAP")));
+#endif
static const struct wine_preload_info wine_main_preload_info[] =
{
More information about the wine-cvs
mailing list