ChangeSet ID:	19401
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2005/08/09 06:19:02

Modified files:
	dlls/ntdll     : Makefile.in 
	dlls/kernel    : Makefile.in 
	dlls           : Makedll.rules.in 

Log message:
	Specify a base address for kernel and ntdll.

Patch: http://cvs.winehq.org/patch.py?id=19401

Old revision  New revision  Changes     Path
 1.100         1.101         +1 -0       wine/dlls/ntdll/Makefile.in
 1.121         1.122         +1 -0       wine/dlls/kernel/Makefile.in
 1.76          1.77          +1 -1       wine/dlls/Makedll.rules.in

Index: wine/dlls/ntdll/Makefile.in
diff -u -p wine/dlls/ntdll/Makefile.in:1.100 wine/dlls/ntdll/Makefile.in:1.101
--- wine/dlls/ntdll/Makefile.in:1.100	Mon May 20 18:21:29 2013
+++ wine/dlls/ntdll/Makefile.in	Mon May 20 18:21:29 2013
@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 MODULE    = ntdll.dll
 IMPORTLIB = libntdll.$(IMPLIBEXT)
 EXTRALIBS = $(LIBUNICODE) @IOKITLIB@
+BASEADDRESS = 0x7bc00000
 
 C_SRCS = \
 	atom.c \

Index: wine/dlls/kernel/Makefile.in
diff -u -p wine/dlls/kernel/Makefile.in:1.121 wine/dlls/kernel/Makefile.in:1.122
--- wine/dlls/kernel/Makefile.in:1.121	Mon May 20 18:21:29 2013
+++ wine/dlls/kernel/Makefile.in	Mon May 20 18:21:29 2013
@@ -7,6 +7,7 @@ MODULE    = kernel32.dll
 IMPORTLIB = libkernel32.$(IMPLIBEXT)
 IMPORTS   = ntdll
 EXTRALIBS = $(LIBUNICODE) @COREFOUNDATIONLIB@
+BASEADDRESS = 0x7b800000
 
 SPEC_SRCS16 = \
 	comm.drv.spec \

Index: wine/dlls/Makedll.rules.in
diff -u -p wine/dlls/Makedll.rules.in:1.76 wine/dlls/Makedll.rules.in:1.77
--- wine/dlls/Makedll.rules.in:1.76	Mon May 20 18:21:29 2013
+++ wine/dlls/Makedll.rules.in	Mon May 20 18:21:29 2013
@@ -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