Bugzilla bug #77199: Make NSS build under OS/2. Thanks to Javier

Pedemonte <pedemont@us.ibm.com> for the patch.
Modified Files:
        coreconf/OS2.mk coreconf/rules.mk coreconf/ruleset.mk
        nss/lib/freebl/Makefile nss/lib/pkcs12/p12.h nss/lib/ssl/ssl.h
        nss/lib/util/secport.h

3 files changed, 29 insertions, 7 deletions

diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 03edadf4a..117e1e38d 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -153,7 +153,7 @@ NSPR_INCLUDE_DIR =
 
 
 ifdef BUILD_OPT
-OPTIMIZER		= -O+ -Oi 
+OPTIMIZER		= -Oi -G5
 DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
 DLLFLAGS		= /DLL /O:$@ /INC:_dllentry /MAP:$(@:.dll=.map)
 EXEFLAGS    		= -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk
index e8258f0af..8d6da693c 100644
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -266,6 +266,13 @@ alltags:
 	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs etags -a
 	find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs ctags -a
 
+ifdef XP_OS2_VACPP
+# list of libs (such as -lnspr4) do not work for our compiler
+# change it to be $(DIST)/lib/nspr4.lib
+EXTRA_SHARED_LIBS := $(filter-out -L%,$(EXTRA_SHARED_LIBS))
+EXTRA_SHARED_LIBS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_SHARED_LIBS))
+endif
+
 $(PROGRAM): $(BUILT_SRCS) $(OBJS) $(EXTRA_LIBS)
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_ARCH),WINNT)
@@ -294,7 +301,7 @@ endif
 
 
 ifeq ($(OS_ARCH),OS2)
-$(IMPORT_LIBRARY): $(BUILT_SRCS) $(OBJS)
+$(IMPORT_LIBRARY): $(BUILT_SRCS) $(SHARED_LIBRARY)
 	rm -f $@
 	$(IMPLIB) $@ $(patsubst %.lib,%.dll.def,$@)
 	$(RANLIB) $@
@@ -329,7 +336,16 @@ ifeq ($(OS_ARCH),OS2)
 	@cmd /C "echo CODE    LOADONCALL MOVEABLE DISCARDABLE >>$@.def"
 	@cmd /C "echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >>$@.def"	
 	@cmd /C "echo EXPORTS >>$@.def"
-	@cmd /C "$(FILTER) $(OBJS) >>$@.def"
+	$(FILTER) $(OBJS) >>$@.def
+ifdef SUB_SHLOBJS
+	@echo Number of words in OBJ list = $(words $(SUB_SHLOBJS))
+	@echo If above number is over 100, need to reedit coreconf/rules.mk
+	-$(FILTER) $(wordlist 1,20,$(SUB_SHLOBJS)) >>$@.def
+	-$(FILTER) $(wordlist 21,40,$(SUB_SHLOBJS)) >>$@.def
+	-$(FILTER) $(wordlist 41,60,$(SUB_SHLOBJS)) >>$@.def
+	-$(FILTER) $(wordlist 61,80,$(SUB_SHLOBJS)) >>$@.def
+	-$(FILTER) $(wordlist 81,100,$(SUB_SHLOBJS)) >>$@.def
+endif
 endif #OS2
 ifdef XP_OS2_VACPP
 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $@.def
diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk
index 4a6e52549..40172c27b 100644
--- a/security/coreconf/ruleset.mk
+++ b/security/coreconf/ruleset.mk
@@ -151,11 +151,17 @@ ifdef LIBRARY_NAME
 		SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
 		IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
 	else
-		LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
-		ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
-			SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
+		ifeq ($(OS_ARCH), OS2)
+			LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).lib
+			SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).dll
+			IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
 		else
-			SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
+			LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
+			ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
+				SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
+			else
+				SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
+			endif
 		endif
 	endif
 endif