Fix for bug 356616 . NSPR DLLs should build at default base address. r=wtchang

nsprpub/lib/ds/Makefile.in

@@ -63,11 +63,6 @@ HEADERS = \
 HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
 
 ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
 RES=$(OBJDIR)/plds.res
 RESNAME=plds.rc
 endif # WINNT

nsprpub/lib/libc/src/Makefile.in

@@ -73,11 +73,6 @@ LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
 RELEASE_LIBS = $(TARGETS)
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
 RES=$(OBJDIR)/plc.res
 RESNAME=plc.rc
 endif # WINNT

nsprpub/lib/msgc/src/Makefile.in

@@ -69,11 +69,6 @@ EXTRA_LIBS += $(OS_LIBS)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
 #RES=$(OBJDIR)/ds.res
 #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
 #OS_LIBS = user32.lib

nsprpub/lib/prstreams/Makefile.in

@@ -88,7 +88,6 @@ CXXSRCS = \
 OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
 
 ifeq ($(OS_ARCH), WINNT)
-        DLLBASE=-BASE:0x30000000
         RES=$(OBJDIR)/prstrms.res
         RESNAME=prstrms.rc
         OS_LIBS = user32.lib

nsprpub/pr/src/Makefile.in

@@ -316,13 +316,6 @@ OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
-ifndef USE_64
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
-endif # !USE_64
 RES=$(OBJDIR)/nspr.res
 RESNAME=nspr.rc
 endif # WINNT

nsprpub/pr/tests/dll/Makefile.in

@@ -68,11 +68,6 @@ ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
 # do nothing
 else
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
 RES=$(OBJDIR)/my.res
 RESNAME=../../../pr/src/nspr.rc
 endif