Fix for bug 330721 . Remove OS/2 VACPP compiler support from NSS . Patch contributed by Peter Weilbacher . r=julien.pierre

10 files changed, 3 insertions, 163 deletions

diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 507ebd1ae..89d7a9f06 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -37,18 +37,6 @@
 
 MOZ_WIDGET_TOOLKIT = os2
 
-# Specify toolset.  Default to EMX.
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-XP_OS2_VACPP = 1
-else
-ifeq ($(MOZ_OS2_TOOLS),PGCC)
-XP_OS2_EMX   = 1
-else
-MOZ_OS2_TOOLS = EMX
-XP_OS2_EMX   = 1
-endif
-endif
-
 # XP_PC is for Window and OS2 on Intel X86
 # XP_OS2 is strictly for OS2 only
 XP_DEFINE  += -DXP_PC=1  -DXP_OS2=1
@@ -63,8 +51,6 @@ DLL_SUFFIX  = DLL
 PROG_SUFFIX = .exe
 
 
-ifdef XP_OS2_EMX
-
 CCC			= gcc
 LINK			= gcc
 AR                      = emxomfar r $@
@@ -78,7 +64,7 @@ FILTER			= emxexp -o
 # GCC for OS/2 currently predefines these, but we don't want them
 DEFINES 		+= -Uunix -U__unix -U__unix__
 
-DEFINES			+= -DXP_OS2_EMX -DTCPV40HDRS
+DEFINES			+= -DTCPV40HDRS
 
 ifeq ($(MOZ_OS2_HIGH_MEMORY),1)
 HIGHMEM_LDFLAG          = -Zhigh-mem
@@ -128,78 +114,6 @@ OBJDIR_TAG 		= _DBG
 LDFLAGS 		= -DEBUG $(HIGHMEM_LDFLAG)
 endif   # BUILD_OPT
 
-else    # XP_OS2_VACPP
-
-# Override suffix in suffix.mk
-OBJ_SUFFIX  = .obj
-ASM_SUFFIX  = .asm
-
-AS = alp.exe
-ifdef BUILD_OPT
-ASFLAGS = -Od
-else
-ASFLAGS = +Od
-endif
-CCC			= icc -q -DXP_OS2 -DOS2=4 -N10
-LINK			= -ilink
-AR		= -ilib /NOL /NOI /O:$(subst /,\\,$@)
-# Keep AR_FLAGS blank so that we do not have to change rules.mk
-AR_FLAGS                = 
-RANLIB 			= @echo OS2 RANLIB
-BSDECHO 		= @echo OS2 BSDECHO
-IMPLIB    = implib /NOL /NOI
-FILTER    = cppfilt -b -p -q
-
-ifndef NO_SHARED_LIB
-WRAP_MALLOC_LIB         = 
-WRAP_MALLOC_CFLAGS      = 
-DSO_CFLAGS              = 
-DSO_PIC_CFLAGS          = 
-MKSHLIB                 = $(LD) $(DSO_LDOPTS)
-MKCSHLIB                = $(LD) $(DSO_LDOPTS)
-MKSHLIB_FORCE_ALL       = 
-MKSHLIB_UNFORCE_ALL     = 
-DSO_LDOPTS              = 
-# DLL_SUFFIX              = .dll
-SHLIB_LDSTARTFILE	= 
-SHLIB_LDENDFILE		= 
-ifdef MAPFILE
-MKSHLIB += $(MAPFILE)
-endif
-PROCESS_MAP_FILE = \
-	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@; \
-	echo PROTMODE >> $@; \
-	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@; \
-	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@; \
-	echo EXPORTS >> $@; \
-	grep -v ';+' $< | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@
-endif   #NO_SHARED_LIB
-
-OS_CFLAGS          = /Q /qlibansi /Gd /Gm /Su4 /Mp /Tl-
-INCLUDES        += -I$(CORE_DEPTH)/../dist/include
-DEFINES         += -DXP_OS2_VACPP -DTCPV40HDRS
-
-DLLFLAGS    = /DLL /O:$@ /INC:_dllentry /MAP:$(@:.dll=.map)
-EXEFLAGS    = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-LDFLAGS     = /FREE /NOE /LINENUMBERS /nologo
-
-ifdef BUILD_OPT
-OPTIMIZER		= /O+ /Gl+ /G5 /qarch=pentium
-DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
-OBJDIR_TAG 		= _OPT
-LDFLAGS     += /NODEBUG /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA
-else
-OS_CFLAGS   += /Ti+
-DEFINES 		+= -DDEBUG -D_DEBUG -DDEBUGPRINTS     #HCT Need += to avoid overidding manifest.mn 
-DLLFLAGS    += /DE
-EXEFLAGS    += /DE
-OBJDIR_TAG 		= _DBG
-LDFLAGS     += /DE
-endif   # BUILD_OPT
-
-endif   # XP_OS2_VACPP
-
 # OS/2 use nsinstall that is included in the toolkit.
 # since we do not wish to support and maintain 3 version of nsinstall in mozilla, nspr and nss
 
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk
index e8beeb640..424bccedf 100644
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -60,10 +60,6 @@ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
 USE_NT_C_SYNTAX=1
 endif
 
-ifdef XP_OS2_VACPP
-USE_NT_C_SYNTAX=1
-endif
-
 #
 # IMPORTS will always be associated with a component.  Therefore,
 # the "import" rule will always change directory to the top-level
@@ -274,13 +270,6 @@ 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): $(OBJS) $(EXTRA_LIBS)
 	@$(MAKE_OBJDIR)
 ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
@@ -292,12 +281,8 @@ ifdef MT
 	fi
 endif	# MSVC with manifest tool
 else
-ifdef XP_OS2_VACPP
-	$(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-else
 	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 endif
-endif
 
 get_objs:
 	@echo $(OBJS)
@@ -353,11 +338,7 @@ ifdef MT
 endif	# MSVC with manifest tool
 endif
 else
-ifdef XP_OS2_VACPP
-	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-else
 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-endif
 	chmod +x $@
 ifeq ($(OS_TARGET),Darwin)
 ifdef MAPFILE
@@ -454,21 +435,15 @@ else
 endif
 endif
 
-ifndef XP_OS2_VACPP
 ifneq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s
 	@$(MAKE_OBJDIR)
 	$(AS) -o $@ $(ASFLAGS) -c $<
 endif
-endif
 
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm
 	@$(MAKE_OBJDIR)
-ifdef XP_OS2_VACPP
-	$(AS) -Fdo:$(OBJDIR) $(ASFLAGS) $(subst /,\\,$<)
-else
 	$(AS) -Fo$@ $(ASFLAGS) -c $<
-endif
 
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S
 	@$(MAKE_OBJDIR)
diff --git a/security/nss/cmd/dbtest/Makefile b/security/nss/cmd/dbtest/Makefile
index 4a59c046f..297114522 100644
--- a/security/nss/cmd/dbtest/Makefile
+++ b/security/nss/cmd/dbtest/Makefile
@@ -58,10 +58,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 include ../platlibs.mk
 
-ifdef XP_OS2_VACPP
-CFLAGS += -I../modutil
-endif
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/security/nss/cmd/lib/secpwd.c b/security/nss/cmd/lib/secpwd.c
index 4d54d1ccf..ea4bc31d7 100644
--- a/security/nss/cmd/lib/secpwd.c
+++ b/security/nss/cmd/lib/secpwd.c
@@ -52,7 +52,7 @@
 #include <unistd.h>  /* for isatty() */
 #endif
 
-#if( defined(_WINDOWS) && !defined(_WIN32_WCE)) || defined(XP_OS2_VACPP)
+#if( defined(_WINDOWS) && !defined(_WIN32_WCE))
 #include <conio.h>
 #include <io.h>
 #define QUIET_FGETS quiet_fgets
@@ -161,7 +161,7 @@ PRBool SEC_BlindCheckPassword(char *cp)
 
 /* Get a password from the input terminal, without echoing */
 
-#if defined(_WINDOWS) || defined(XP_OS2_VACPP)
+#if defined(_WINDOWS)
 static char * quiet_fgets (char *buf, int length, FILE *input)
   {
   int c;
@@ -170,15 +170,9 @@ static char * quiet_fgets (char *buf, int length, FILE *input)
   /* fflush (input); */
   memset (buf, 0, length);
 
-#ifndef XP_OS2_VACPP
-  if (input != stdin) {
-     return fgets(buf,length,input);
-  }
-#else
   if (!isatty(fileno(input))) {
      return fgets(buf,length,input);
   }
-#endif
 
   while (1)
     {
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk
index bd00ea9a3..a09fa0b29 100644
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -194,13 +194,6 @@ endif
 
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
-ifdef XP_OS2_VACPP
-EXTRA_SHARED_LIBS += \
-	$(NSPR_LIB_DIR)/plc4.lib \
-	$(NSPR_LIB_DIR)/plds4.lib \
-	$(NSPR_LIB_DIR)/nspr4.lib \
-	$(NULL)
-else
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
 	$(SQLITE) \
@@ -214,7 +207,6 @@ endif
 ifeq ($(OS_TARGET), SunOS)
 OS_LIBS += -lbsm
 endif
-endif
 
 else # USE_STATIC_LIBS
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index ddd0bddf3..b8a3a2147 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -54,10 +54,6 @@
 #include <process.h>	/* for getpid() */
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <Process.h>	/* for getpid() */
-#endif
-
 #include <signal.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index 04dd74ef8..160298472 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -566,14 +566,6 @@ endif
 endif  # FREEBL_CHILD_BUILD
 
 
-# Bugzilla Bug 209827: disable optimization to work around what appears
-# to be a VACPP optimizer bug.
-ifdef XP_OS2_VACPP
-$(OBJDIR)/alg2268.obj: alg2268.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $(call core_abspath,$<)
-endif
-
 # Bugzilla Bug 333917: the non-x86 code in desblapi.c seems to violate
 # ANSI C's strict aliasing rules.
 ifeq ($(OS_TARGET),Linux)
diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile
index 0b3017de6..a3cca6ab0 100644
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -90,14 +90,3 @@ $(OBJDIR)/pk11slot.o: pk11slot.c
 endif
 endif
 endif
-
-# Bugzilla Bug 209827: disable optimization to work around what appears
-# to be a VACPP optimizer bug.
-ifdef XP_OS2_VACPP
-$(OBJDIR)/pk11skey.obj: pk11skey.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $(call core_abspath,$<)
-$(OBJDIR)/pk11slot.obj: pk11slot.c
-	@$(MAKE_OBJDIR)
-	$(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $(call core_abspath,$<)
-endif
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index a991b7428..2d5bf3427 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -1474,10 +1474,6 @@ void ssl_Trace(const char *format, ...);
 
 SEC_END_PROTOS
 
-#ifdef XP_OS2_VACPP
-#include <process.h>
-#endif
-
 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
 #define SSL_GETPID getpid
 #elif defined(_WIN32_WCE)
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 583b500a4..f4df588e8 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -108,10 +108,6 @@
 #include "nsslocks.h"
 #include "sslmutex.h"
 
-#ifdef XP_OS2_VACPP
-#pragma pack(1)
-#endif
-
 /*
 ** Format of a cache entry in the shared memory.
 */