diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-12-01 23:17:31 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-12-01 23:17:31 +0000 |
| commit | b07969053f43a7a46e25b1eb3d2f0b16f66e0ced (patch) | |
| tree | acbdf9fee3146187d2e1a85abd389abe3c9cf437 | |
| parent | d5dfc7ec3a1a1de2edbe23731d7510c79512a427 (diff) | |
| download | nspr-hg-b07969053f43a7a46e25b1eb3d2f0b16f66e0ced.tar.gz | |
Fix for bug 356616 . NSPR DLLs should build at default base address. r=wtchang
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
| -rw-r--r-- | lib/ds/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/libc/src/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/msgc/src/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/prstreams/Makefile.in | 1 | ||||
| -rw-r--r-- | pr/src/Makefile.in | 7 | ||||
| -rw-r--r-- | pr/tests/dll/Makefile.in | 5 |
6 files changed, 0 insertions, 28 deletions
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index 2916ab70..5a2e0722 100644 --- a/lib/ds/Makefile.in +++ b/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 diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index fcdbae60..a0f4295f 100644 --- a/lib/libc/src/Makefile.in +++ b/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 diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index de834cc5..5d5a1146 100644 --- a/lib/msgc/src/Makefile.in +++ b/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 diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index 679c03d9..a29af95d 100644 --- a/lib/prstreams/Makefile.in +++ b/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 diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index edaaa15f..2d785bdc 100644 --- a/pr/src/Makefile.in +++ b/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 diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in index 906f5310..a9cbac43 100644 --- a/pr/tests/dll/Makefile.in +++ b/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 |