From 475f2336ccaf0cb0be1fa7a7b7a3dce28dc8fca9 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 9 Aug 2005 11:19:01 +0000
Subject: [PATCH] Specify a base address for kernel and ntdll.

---
 dlls/Makedll.rules.in   | 2 +-
 dlls/kernel/Makefile.in | 1 +
 dlls/ntdll/Makefile.in  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 1f4da924a5c..0cd37276d33 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -32,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS)
 # Rules for .so files
 
 $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) -o $@ $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
 # Rules for .dll files
 
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index 36d8a7ed9fc..53137c4879d 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -7,6 +7,7 @@ MODULE    = kernel32.dll
 IMPORTLIB = libkernel32.$(IMPLIBEXT)
 IMPORTS   = ntdll
 EXTRALIBS = $(LIBUNICODE) @COREFOUNDATIONLIB@
+BASEADDRESS = 0x7b800000
 
 SPEC_SRCS16 = \
 	comm.drv.spec \
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 48b01dc9bff..c22476075b2 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 MODULE    = ntdll.dll
 IMPORTLIB = libntdll.$(IMPLIBEXT)
 EXTRALIBS = $(LIBUNICODE) @IOKITLIB@
+BASEADDRESS = 0x7bc00000
 
 C_SRCS = \
 	atom.c \