I found that the Windows linker 'link' pulls from an archive library only

the object files needed to resolve referenced symbols, so we will need to
link with the objects directly as we do on Unix.  As a result, nss3.dll
needs to export more (PKCS7) symbols, needed by the new PKCS12 objects
that are linked into smime3.dll.
Modified Files:
    coreconf/rules.mk nss/lib/nss/config.mk
    nss/lib/smime/config.mk nss/lib/ssl/config.mk

security/coreconf/rules.mk

@@ -348,7 +348,7 @@ ifeq ($(OS_TARGET), WIN16)
 	$(LINK) @w16link.
 	rm w16link
 else
-	$(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS)
+	$(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS)
 endif
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)

security/nss/lib/nss/config.mk

@@ -53,15 +53,13 @@ DLLFLAGS += -DEF:nss.def
 
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 CRYPTOLIB=$(DIST)/lib/freebl.lib
+CRYPTODIR=../freebl
 ifdef MOZILLA_SECURITY_BUILD
 	CRYPTOLIB=$(DIST)/lib/crypto.lib
-endif
-ifdef MOZILLA_BSAFE_BUILD
-	CRYPTOLIB+=$(DIST)/lib/bsafe$(BSAFEVER).lib
-	CRYPTOLIB+=$(DIST)/lib/freebl.lib
+	CRYPTODIR=../crypto
 endif
 
-EXTRA_LIBS += \
+SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/pkcs7.lib \
 	$(DIST)/lib/certhi.lib \
 	$(DIST)/lib/cryptohi.lib \
@@ -70,7 +68,28 @@ EXTRA_LIBS += \
 	$(DIST)/lib/softoken.lib \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/secutil.lib \
+	$(NULL)
+
+SHARED_LIBRARY_DIRS = \
+	../pkcs7 \
+	../certhigh \
+	../cryptohi \
+	../pk11wrap \
+	../certdb \
+	../softoken \
+	$(CRYPTODIR) \
+	../util \
+	$(NULL)
+
+EXTRA_LIBS += \
 	$(DIST)/lib/dbm.lib \
+	$(NULL)
+
+ifdef MOZILLA_BSAFE_BUILD
+	EXTRA_LIBS+=$(DIST)/lib/bsafe$(BSAFEVER).lib
+endif
+
+EXTRA_SHARED_LIBS += \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \

security/nss/lib/smime/config.mk

@@ -52,8 +52,15 @@ IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
 
 DLLFLAGS += -DEF:smime.def
 
-EXTRA_LIBS += \
+SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/pkcs12.lib \
+	$(NULL)
+
+SHARED_LIBRARY_DIRS = \
+	../pkcs12 \
+	$(NULL)
+
+EXTRA_SHARED_LIBS += \
 	$(DIST)/lib/nss3.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \

security/nss/lib/ssl/config.mk

@@ -50,7 +50,7 @@ IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
 
 DLLFLAGS += -DEF:ssl.def
 
-EXTRA_LIBS += \
+EXTRA_SHARED_LIBS += \
 	$(DIST)/lib/nss3.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \