Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Set the deault base for user mode dlls to 0x10000000.

Browse source 
- Fixed the reloc entries for a user mode dll by a second call to ld/dlltools.

svn path=/trunk/; revision=5289
This commit is contained in:
Hartmut Birr 2003-07-27 14:08:38 +00:00
parent 70ebdbd3ec
commit b7b1ad8ea9
1 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
reactos/tools/helper.mk
View file

@ -1,4 +1,4 @@
# $Id: helper.mk,v 1.40 2003/07/11 18:13:57 chorns Exp $ # $Id: helper.mk,v 1.41 2003/07/27 14:08:38 hbirr Exp $
# #
# Helper makefile for ReactOS modules # Helper makefile for ReactOS modules
# Variables this makefile accepts: # Variables this makefile accepts:
@ -452,7 +452,11 @@ endif
ifeq ($(MK_MODE),user) ifeq ($(MK_MODE),user)
ifeq ($(MK_EXETYPE),dll)
MK_DEFBASE := 0x10000000
else
MK_DEFBASE := 0x400000 MK_DEFBASE := 0x400000
endif
ifneq ($(TARGET_SDKLIBS),) ifneq ($(TARGET_SDKLIBS),)
MK_LIBS := $(addprefix $(SDK_PATH_LIB)/, $(TARGET_SDKLIBS)) MK_LIBS := $(addprefix $(SDK_PATH_LIB)/, $(TARGET_SDKLIBS))
else else
@ -587,6 +591,17 @@ ifeq ($(MK_EXETYPE),dll)
--base-file base.tmp \ --base-file base.tmp \
--output-exp temp.exp $(MK_EXTRACMD) --output-exp temp.exp $(MK_EXTRACMD)
- $(RM) base.tmp - $(RM) base.tmp
$(CC) -Wl,--base-file,base.tmp \
-Wl,--entry,$(TARGET_ENTRY) \
$(TARGET_LFLAGS) \
temp.exp \
-o junk.tmp \
$(MK_FULLRES) $(MK_OBJECTS) $(MK_LIBS) $(MK_GCCLIBS)
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
--output-exp temp.exp $(MK_EXTRACMD)
- $(RM) base.tmp
endif endif
$(CC) $(TARGET_LFLAGS) \ $(CC) $(TARGET_LFLAGS) \
-Wl,--entry,$(TARGET_ENTRY) $(MK_EXTRACMD2) \ -Wl,--entry,$(TARGET_ENTRY) $(MK_EXTRACMD2) \
@ -601,12 +616,27 @@ else
endif endif
$(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP) $(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP)
$(LD) -r -o $(MK_STRIPPED_OBJECT) $(MK_OBJECTS)
$(STRIP) --strip-debug $(MK_STRIPPED_OBJECT)
ifeq ($(MK_EXETYPE),dll) ifeq ($(MK_EXETYPE),dll)
$(CC) -Wl,--base-file,base.tmp \ $(CC) -Wl,--base-file,base.tmp \
-Wl,--entry,$(TARGET_ENTRY) \ -Wl,--entry,$(TARGET_ENTRY) \
-Wl,--strip-debug \
$(TARGET_LFLAGS) \ $(TARGET_LFLAGS) \
-o junk.tmp \ -o junk.tmp \
$(MK_FULLRES) $(MK_OBJECTS) $(MK_LIBS) $(MK_GCCLIBS) $(MK_FULLRES) $(MK_STRIPPED_OBJECT) $(MK_LIBS) $(MK_GCCLIBS)
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
--output-exp temp.exp $(MK_EXTRACMD)
- $(RM) base.tmp
$(CC) -Wl,--base-file,base.tmp \
-Wl,--entry,$(TARGET_ENTRY) \
-Wl,--strip-debug \
$(TARGET_LFLAGS) \
temp.exp \
-o junk.tmp \
$(MK_FULLRES) $(MK_STRIPPED_OBJECT) $(MK_LIBS) $(MK_GCCLIBS)
- $(RM) junk.tmp - $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \ $(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \ --base-file base.tmp \
@ -614,11 +644,12 @@ ifeq ($(MK_EXETYPE),dll)
- $(RM) base.tmp - $(RM) base.tmp
endif endif
$(CC) $(TARGET_LFLAGS) \ $(CC) $(TARGET_LFLAGS) \
-Wl,--entry,$(TARGET_ENTRY) $(MK_EXTRACMD2) \ -Wl,--entry,$(TARGET_ENTRY) \
-o $(MK_FULLNAME) \
-Wl,--strip-debug \ -Wl,--strip-debug \
$(MK_FULLRES) $(MK_OBJECTS) $(MK_LIBS) $(MK_GCCLIBS) $(MK_EXTRACMD2) \
- $(RM) temp.exp -o $(MK_FULLNAME) \
$(MK_FULLRES) $(MK_STRIPPED_OBJECT) $(MK_LIBS) $(MK_GCCLIBS)
- $(RM) temp.exp $(MK_STRIPPED_OBJECT)
endif # KM_MODE endif # KM_MODE