Brought coreconf on the JSS_3_X_BRANCH up to date with NSS_3_9_3_RTM.JSS_3_6_RTMJSS_3_6_BETA1

Modified Files:
	AIX.mk Linux.mk OS2.mk SunOS5.10_i86pc.mk SunOS5.mk WIN32.mk
	WIN954.0.mk WINCE3.0.mk WINNT3.51.mk WINNT4.0.mk WINNT5.0.mk
	WINNT5.1.mk config.mk rules.mk nsinstall/Makefile
Removed Files:
	AIX3.2.mk AIX4.1.mk AIX4.2.mk AIX4.3.mk AIX5.1.mk AIX5.2.mk

21 files changed, 98 insertions, 334 deletions

diff --git a/security/coreconf/AIX.mk b/security/coreconf/AIX.mk
index ff0a36f2b..9b8f4c82f 100644
--- a/security/coreconf/AIX.mk
+++ b/security/coreconf/AIX.mk
@@ -65,16 +65,30 @@ CPU_ARCH	= rs6000
 RANLIB		= ranlib
 
 OS_CFLAGS	= -DAIX -DSYSV
+OS_LIBS 	+= -blibpath:/usr/lib:/lib -lc -lm
+
+DSO_LDOPTS	= -brtl -bnortllib -bM:SRE -bnoentry
+MKSHLIB 	= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
 
 AIX_WRAP	= $(DIST)/lib/aixwrap.o
 AIX_TMP		= $(OBJDIR)/_aix_tmp.o
+
 ifdef MAPFILE
-EXPORT_RULES = -bexport:$(MAPFILE)
+DSO_LDOPTS	+= -bexport:$(MAPFILE)
+else
+DSO_LDOPTS	+= -bexpall
 endif
+
 PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
 
 ifdef BUILD_OPT
-        OPTIMIZER += -qmaxmem=-1
+	OPTIMIZER += -qmaxmem=-1
+endif
+
+ifeq ($(USE_64), 1)
+	OS_CFLAGS	+= -DAIX_64BIT
+	OBJECT_MODE=64
+	export OBJECT_MODE
 endif
 
diff --git a/security/coreconf/AIX3.2.mk b/security/coreconf/AIX3.2.mk
deleted file mode 100644
index c93a00eef..000000000
--- a/security/coreconf/AIX3.2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX3.2.5
-#
-include $(CORE_DEPTH)/coreconf/AIX.mk
diff --git a/security/coreconf/AIX4.1.mk b/security/coreconf/AIX4.1.mk
deleted file mode 100644
index 115ee8dc8..000000000
--- a/security/coreconf/AIX4.1.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX4.1
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-AIX_LINK_OPTS  += -bnso -berok
-#AIX_LINK_OPTS += -bnso -berok -brename:.select,.wrap_select -brename:.poll,.wrap_poll -bI:/usr/lib/syscalls.exp
-
-# The AIX4.1 linker had a bug which always looked for a dynamic library
-# with an extension of .a.  AIX4.2 fixed this problem
-DLL_SUFFIX = a
-
-OS_LIBS		+= -lsvld
-
-# override default value set in suffix.mk, for AIX 4.1 only
-DYNAMIC_LIB_EXTENSION = _shr
-
-# override default value in ruleset.mk
-ifdef LIBRARY_NAME
-    SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
-endif
-
diff --git a/security/coreconf/AIX4.2.mk b/security/coreconf/AIX4.2.mk
deleted file mode 100644
index 6975116b4..000000000
--- a/security/coreconf/AIX4.2.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#
-# Config stuff for AIX4.2
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-OS_CFLAGS	+= -DAIX4_2
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -L/usr/lpp/xlC/lib -lc -lm
-
-OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS	+= -bexport:$(MAPFILE)
-else
-DSO_LDOPTS	+= -bexpall
-endif
-
-
diff --git a/security/coreconf/AIX4.3.mk b/security/coreconf/AIX4.3.mk
deleted file mode 100644
index c3788c15d..000000000
--- a/security/coreconf/AIX4.3.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX4.3
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-OS_CFLAGS	+= -DAIX4_3
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif
diff --git a/security/coreconf/AIX5.1.mk b/security/coreconf/AIX5.1.mk
deleted file mode 100644
index 1d88c32e5..000000000
--- a/security/coreconf/AIX5.1.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX5.1
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif
diff --git a/security/coreconf/AIX5.2.mk b/security/coreconf/AIX5.2.mk
deleted file mode 100644
index 319569c52..000000000
--- a/security/coreconf/AIX5.2.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX5.2
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
index 13f2f7715..6aab35b12 100644
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -66,6 +66,10 @@ ifeq ($(OS_TEST),ia64)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ia64
 else
+ifeq ($(OS_TEST),x86_64)
+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+	CPU_ARCH	= x86_64
+else
 ifeq ($(OS_TEST),sparc)
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = sparc
@@ -112,6 +116,7 @@ endif
 endif
 endif
 endif
+endif
 
 
 LIBC_TAG		= _glibc
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index a8eed088f..5b3b51d0b 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -54,7 +54,8 @@ LIB_PREFIX  = $(NULL)
 
 # Override suffix in suffix.mk
 LIB_SUFFIX  = lib
-DLL_SUFFIX  = dll
+# the DLL_SUFFIX must be uppercase for FIPS mode to work. bugzilla 240784
+DLL_SUFFIX  = DLL
 PROG_SUFFIX = .exe
 
 
diff --git a/security/coreconf/SunOS5.10_i86pc.mk b/security/coreconf/SunOS5.10_i86pc.mk
index 9205e6448..39bd787d1 100755
--- a/security/coreconf/SunOS5.10_i86pc.mk
+++ b/security/coreconf/SunOS5.10_i86pc.mk
@@ -37,9 +37,12 @@ SOL_CFLAGS	= -D_SVID_GETTOD
 
 include $(CORE_DEPTH)/coreconf/SunOS5.mk
 
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
+ifeq ($(USE_64),1)
+    CPU_ARCH		= x86_64
+else
+    CPU_ARCH		= x86
+    OS_DEFINES		+= -Di386
+endif
 
 ifeq ($(OS_RELEASE),5.10_i86pc)
 	OS_DEFINES += -DSOLARIS2_10
diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk
index ec7d94eda..15ac35363 100644
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -53,22 +53,28 @@ endif
 
 ifeq ($(USE_64), 1)
   ifdef NS_USE_GCC
-      ARCHFLAG= UNKNOWN 
+      ARCHFLAG=-m64
   else
-      ARCHFLAG=-xarch=v9
+      ifeq ($(OS_TEST),i86pc)
+        ARCHFLAG=-xarch=amd64
+      else
+        ARCHFLAG=-xarch=v9
+      endif
   endif
 else
-  ifdef NS_USE_GCC
-    ifdef USE_HYBRID
-      ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
+  ifneq ($(OS_TEST),i86pc)
+    ifdef NS_USE_GCC
+      ifdef USE_HYBRID
+        ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
+      else
+        ARCHFLAG=-mcpu=v8
+      endif
     else
-      ARCHFLAG=-mcpu=v8
-    endif
-  else
-    ifdef USE_HYBRID
-      ARCHFLAG=-xarch=v8plus
-    else
-      ARCHFLAG=-xarch=v8
+      ifdef USE_HYBRID
+        ARCHFLAG=-xarch=v8plus
+      else
+        ARCHFLAG=-xarch=v8
+      endif
     endif
   endif
 endif
@@ -104,6 +110,9 @@ ifdef NS_USE_GCC
 		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 	OS_CFLAGS += $(ARCHFLAG)
+	ifdef BUILD_OPT
+	    OPTIMIZER = -O2
+	endif
 else
 	CC         = cc
 	CCC        = CC
@@ -157,10 +166,17 @@ PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
 # -G: produce a shared object
 # -z defs: no unresolved symbols allowed
 ifdef NS_USE_GCC
+ifeq ($(USE_64), 1)
+	DSO_LDOPTS += -m64
+endif
 	DSO_LDOPTS += -shared -h $(notdir $@)
 else
 ifeq ($(USE_64), 1)
-	DSO_LDOPTS += -xarch=v9
+	ifeq ($(OS_TEST),i86pc)
+	    DSO_LDOPTS +=-xarch=amd64
+	else
+	    DSO_LDOPTS +=-xarch=v9
+	endif
 endif
 	DSO_LDOPTS += -G -h $(notdir $@)
 endif
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
index d275300b2..18a027354 100644
--- a/security/coreconf/WIN32.mk
+++ b/security/coreconf/WIN32.mk
@@ -116,7 +116,12 @@ else # !NS_USE_GCC
 	#
 	ifdef MOZ_PROFILE
 		OPTIMIZER += -Z7
-		DLLFLAGS += -DEBUG -DEBUGTYPE:CV
+	endif
+	ifdef MOZ_DEBUG_SYMBOLS
+		OPTIMIZER += -Zi
+	endif
+	ifneq (,$(MOZ_PROFILE)$(MOZ_DEBUG_SYMBOLS))
+		DLLFLAGS += -DEBUG -OPT:REF
 	endif
     else
 	#
@@ -135,9 +140,9 @@ else # !NS_USE_GCC
 	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
 	USERNAME   := $(subst -,_,$(USERNAME))
 	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
-	DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
+	DLLFLAGS   += -DEBUG -OUT:"$@"
 	# Purify requires /FIXED:NO when linking EXEs.
-	LDFLAGS    += -DEBUG -DEBUGTYPE:CV -PDB:NONE /FIXED:NO
+	LDFLAGS    += -DEBUG -PDB:NONE /FIXED:NO
     endif
 endif # NS_USE_GCC
 
diff --git a/security/coreconf/WIN954.0.mk b/security/coreconf/WIN954.0.mk
index e710f6e2e..13aa6519c 100644
--- a/security/coreconf/WIN954.0.mk
+++ b/security/coreconf/WIN954.0.mk
@@ -58,6 +58,9 @@ else
 endif
 
 ifndef NS_USE_GCC
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
 endif
 DEFINES += -DWIN95
diff --git a/security/coreconf/WINCE3.0.mk b/security/coreconf/WINCE3.0.mk
index ddf7a4c7b..375cb4a5a 100644
--- a/security/coreconf/WINCE3.0.mk
+++ b/security/coreconf/WINCE3.0.mk
@@ -65,7 +65,7 @@ OS_CFLAGS += -W3 -nologo
 
 OS_DLLFLAGS += -DLL 
 
-LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
+LINKFLAGS = -nologo -subsystem:windowsce,3.00 \
  -nodefaultlib:libc.lib \
  -nodefaultlib:libcd.lib \
  -nodefaultlib:libcmt.lib \
@@ -75,6 +75,10 @@ LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
  -nodefaultlib:oldnames.lib \
  $(NULL)
 
+ifndef MOZ_DEBUG_SYMBOLS
+    LINKFLAGS += -PDB:NONE
+endif
+
 LINK    += $(LINKFLAGS)
 LDFLAGS += $(LINKFLAGS)
 
diff --git a/security/coreconf/WINNT3.51.mk b/security/coreconf/WINNT3.51.mk
index b422b2b56..42a268ed4 100644
--- a/security/coreconf/WINNT3.51.mk
+++ b/security/coreconf/WINNT3.51.mk
@@ -55,8 +55,11 @@ endif
 
 OS_WIN_CFLAGS += -W3
 OS_CFLAGS     += -nologo $(OS_WIN_CFLAGS) $(OS_PROC_CFLAGS)
-#OS_DLLFLAGS  += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
-OS_DLLFLAGS   += -nologo -DLL -PDB:NONE -SUBSYSTEM:WINDOWS
+OS_DLLFLAGS   += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS   += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT4.0.mk b/security/coreconf/WINNT4.0.mk
index 7fc5a54d6..d15f547ee 100644
--- a/security/coreconf/WINNT4.0.mk
+++ b/security/coreconf/WINNT4.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.0.mk b/security/coreconf/WINNT5.0.mk
index 303b98007..81cd668ed 100644
--- a/security/coreconf/WINNT5.0.mk
+++ b/security/coreconf/WINNT5.0.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/WINNT5.1.mk b/security/coreconf/WINNT5.1.mk
index f9c7ed1c8..90b063a29 100644
--- a/security/coreconf/WINNT5.1.mk
+++ b/security/coreconf/WINNT5.1.mk
@@ -55,7 +55,11 @@ else
 	endif
 endif
 
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ifndef MOZ_DEBUG_SYMBOLS
+	OS_DLLFLAGS += -PDB:NONE
+endif
+
 #
 # Win NT needs -GT so that fibers can work
 #
diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk
index 1bb3962f4..884915875 100644
--- a/security/coreconf/config.mk
+++ b/security/coreconf/config.mk
@@ -59,7 +59,7 @@ endif
 #######################################################################
 
 TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-              OpenVMS
+              OpenVMS AIX
 
 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/security/coreconf/nsinstall/Makefile b/security/coreconf/nsinstall/Makefile
index 1bb7d728f..f8eb829de 100644
--- a/security/coreconf/nsinstall/Makefile
+++ b/security/coreconf/nsinstall/Makefile
@@ -52,6 +52,7 @@ ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
 PROGRAM		=
 else
 TARGETS		= $(PROGRAM) $(PLSRCS:.pl=)
+INSTALL		= true
 endif
 
 ifdef NATIVE_CC
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk
index ff380d472..1fc34a259 100644
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -301,7 +301,7 @@ get_objs:
 $(LIBRARY): $(OBJS)
 	@$(MAKE_OBJDIR)
 	rm -f $@
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
 	$(AR) $(subst /,\\,$(OBJS))
 else
 	$(AR) $(OBJS)