Allow freebl to build on IRIX using gcc.

Thanks to John Vandenberg <zeroJ@null.net> for the patch.
Bug #80809


git-svn-id: svn://10.0.0.236/branches/NSS_CLIENT_BRANCH@95882 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/coreconf/.cshrc

@@ -0,0 +1,273 @@
+#!/bin/csh
+#
+# 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.
+#
+# Startup file for csh and tcsh.  It is meant to work on:
+#
+#	SunOS 4.1.3_U1,
+#	Sun Solaris,
+#	Sun Solaris on Intel,
+#	SGI IRIX,
+#	SGI IRIX64,
+#	UNIX_SV,
+#	IBM AIX,
+#	Hewlett-Packard HP-UX,
+#	SCO_SV,
+#	FreeBSD,
+#	DEC OSF/1,
+#	Linux,
+#	and everything else.
+#
+
+###############################################
+# Set operating system name and release level #
+###############################################
+
+set os_name=`uname -s`
+set os_release=`uname -r`
+
+##########################################################
+#  Set environment variables based upon operating system #
+##########################################################
+
+if ($os_name == "SunOS" && $os_release == "4.1.3_U1") then
+	##############################
+	# SunOS 4.1.3_U1
+	#
+
+	setenv NO_MDUPDATE 1
+
+	set path = (	/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_sunos4.1.3_U1/bin \
+			/tools/ns/bin \
+			/sbin \
+			/usr/bin \
+			/usr/openwin/bin \
+			/usr/openwin/include \
+			/usr/ucb \
+			/usr/local/bin \
+			/etc \
+			/usr/etc \
+			/usr/etc/install \
+			. )
+
+else if ($os_name == "SunOS") then
+	################################
+	#  Assume it is Sun Solaris
+	#
+
+	# To build Navigator on Solaris 2.5, I must set the environment
+	# variable NO_MDUPDATE and use gcc-2.6.3.
+	setenv NO_MDUPDATE 1
+
+	set path = (	/share/builds/components/jdk/1.2.2_01/SunOS \
+			/usr/ccs/bin \
+			/usr/opt/bin \
+			/tools/ns/bin \
+			/usr/sbin \
+			/sbin \
+			/usr/bin \
+			/usr/dt/bin \
+			/usr/openwin/bin \
+			/usr/openwin/include \
+			/usr/ucb \
+			/usr/opt/java/bin \
+			/usr/local/bin \
+			/etc \
+			/usr/etc \
+			/usr/etc/install \
+			/opt/Acrobat3/bin \
+			. )
+
+	# To get the native Solaris cc
+	if (`uname -m` == i86pc) then
+		set path = (	/h/solx86/export/home/opt/SUNWspro/SC3.0.1/bin \
+				$path )
+	else
+		set path = (	/tools/ns/workshop/bin \
+				/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin \
+				$path )
+	endif
+
+	setenv LD_LIBRARY_PATH /share/builds/components/jdk/1.2.2_01/SunOS/lib/sparc/native_threads
+
+	setenv MANPATH /usr/local/man:/usr/local/lib/mh/man:/usr/local/lib/rcscvs/man:/usr/local/lib/fvwm/man:/usr/local/lib/xscreensaver/man:/usr/share/man:/usr/openwin/man:/usr/opt/man
+
+	# For Purify
+	setenv PURIFYHOME /usr/local-sparc-solaris/pure/purify-4.0-solaris2
+	setenv PATH ${PURIFYHOME}:$PATH
+	setenv MANPATH $PURIFYHOME/man:$MANPATH
+	setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$PURIFYHOME
+	setenv PURIFYOPTIONS "-max_threads=1000 -follow-child-processes=yes"
+
+else if ($os_name == "IRIX" || $os_name == "IRIX64") then
+	#############
+	#  SGI Irix
+	#
+
+	set path = (	/share/builds/components/jdk/1.2.1/IRIX \
+			/tools/ns/bin \
+			/tools/contrib/bin \
+			/usr/local/bin \
+			/usr/sbin \
+			/usr/bsd \
+			/usr/bin \
+			/bin \
+			/etc \
+			/usr/etc \
+			/usr/bin/X11 \
+			. )
+
+else if ($os_name == "UNIX_SV") then
+	#################
+	# UNIX_SV
+	#
+
+	set path = (	/usr/local/bin \
+			/tools/ns/bin \
+			/bin \
+			/usr/bin \
+			/usr/bin/X11 \
+			/X11/bin \
+			/usr/X/bin \
+			/usr/ucb \
+			/usr/sbin \
+			/sbin \
+			/usr/ccs/bin \
+			. )
+
+else if ($os_name == "AIX") then
+	#################
+	#  IBM AIX
+	#
+
+	set path = (	/share/builds/components/jdk/1.2.2/AIX \
+			/usr/ucb/ \
+			/tools/ns-arch/rs6000_ibm_aix4.1/bin \
+			/tools/ns-arch/rs6000_ibm_aix3.2.5/bin \
+			/share/tools/ns/soft/cvs-1.8/run/default/rs6000_ibm_aix3.2.5/bin \
+			/bin \
+			/usr/bin \
+			/usr/ccs/bin \
+			/usr/sbin \
+			/usr/local/bin \
+			/usr/bin/X11 \
+			/usr/etc \
+			/etc \
+			/sbin \
+			. )
+
+else if ($os_name == "HP-UX") then
+	#################
+	# HP UX
+	#
+
+	set path = (	/share/builds/components/jdk/1.1.6/HP-UX \
+			/usr/bin \
+			/opt/ansic/bin \
+			/usr/ccs/bin \
+			/usr/contrib/bin \
+			/opt/nettladm/bin \
+			/opt/graphics/common/bin \
+			/usr/bin/X11 \
+			/usr/contrib/bin/X11 \
+			/opt/upgrade/bin \
+			/opt/CC/bin \
+			/opt/aCC/bin	\
+			/opt/langtools/bin \
+			/opt/imake/bin \
+			/etc \
+			/usr/etc \
+			/usr/local/bin \
+			/tools/ns/bin \
+			/tools/contrib/bin \
+			/usr/sbin \
+			/usr/local/bin \
+			/tools/ns/bin \
+			/tools/contrib/bin \
+			/usr/sbin \
+			/usr/include/X11R5 \
+			. )
+
+else if ($os_name == "SCO_SV") then
+	#################
+	# SCO
+	#
+
+	set path = (	/bin \
+			/usr/bin \
+			/tools/ns/bin \
+			/tools/contrib/bin \
+			/usr/sco/bin \
+			/usr/bin/X11 \
+			/usr/local/bin \
+			. )
+
+else if ($os_name == "FreeBSD") then
+	#################
+	# FreeBSD
+	#
+
+	setenv PATH /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/java/bin:/usr/local/bin:/usr/ucb:/usr/ccs/bin:/tools/contrib/bin:/tools/ns/bin:.
+
+else if ($os_name == "OSF1") then
+	#################
+	# DEC OSF1
+	#
+
+	set path = (	/share/builds/components/jdk/1.2.2_3/OSF1 \
+			/tools/ns-arch/alpha_dec_osf4.0/bin \
+			/tools/ns-arch/soft/cvs-1.8.3/run/default/alpha_dec_osf2.0/bin \
+			/usr/local-alpha-osf/bin \
+			/usr3/local/bin \
+			/usr/local/bin \
+			/usr/sbin \
+			/usr/bin \
+			/bin \
+			/usr/bin/X11 \
+			/usr/ucb \
+			. )
+
+else if ($os_name == "Linux") then
+	#################
+	# Linux
+	#
+
+	set path = (	/share/builds/components/jdk/1.2.2/Linux \
+			$path )
+
+endif
+
+###############################
+# Reset any "tracked" aliases #
+###############################
+
+rehash

mozilla/security/coreconf/.profile

@@ -0,0 +1,216 @@
+#!/bin/sh
+#
+# 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.
+#
+# Startup file for sh, ksh and bash.  It is meant to work on:
+#
+#	SunOS 4.1.3_U1,
+#	Sun Solaris,
+#	Sun Solaris on Intel,
+#	SGI IRIX,
+#	SGI IRIX64,
+#	UNIX_SV,
+#	IBM AIX,
+#	Hewlett-Packard HP-UX,
+#	SCO_SV,
+#	FreeBSD,
+#	DEC OSF/1,
+#	Linux,
+#	and everything else.
+#
+
+###############################################
+# Set operating system name and release level #
+###############################################
+
+OS_NAME=`uname -s`
+export OS_NAME
+
+OS_RELEASE=`uname -r`
+export OS_RELEASE
+
+##########################################################
+#  Set environment variables based upon operating system #
+##########################################################
+
+case $OS_NAME in
+
+	SunOS)
+		##############################
+		# Sun
+		#
+
+		case $OS_RELEASE in
+
+			4.1.3_U1)
+				##############################
+				# SunOS 4.1.3_U1
+				#
+
+				NO_MDUPDATE=1
+				export NO_MDUPDATE
+
+				PATH=/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_sunos4.1.3_U1/bin:tools/ns/bin:/sbin:/usr/bin:/usr/openwin/bin:/usr/openwin/include:/usr/ucb:/usr/local/bin:/etc:/usr/etc:/usr/etc/install:.
+				export PATH
+				;;
+
+			*)
+				################################
+				#  Assume it is Sun Solaris
+				#
+
+				# To build Navigator on Solaris 2.5, I must set the environment
+				# variable NO_MDUPDATE and use gcc-2.6.3.
+				NO_MDUPDATE=1
+				export NO_MDUPDATE
+
+				PATH=/share/builds/components/jdk/1.2.2_01/SunOS:/usr/ccs/bin:/usr/opt/bin:/tools/ns/bin:/usr/sbin:/sbin:/usr/bin:/usr/dt/bin:/usr/openwin/bin:/usr/openwin/include:/usr/ucb:/usr/opt/java/bin:/usr/local/bin:/etc:/usr/etc:/usr/etc/install:/opt/Acrobat3/bin:.
+				export PATH
+
+				# To get the native Solaris cc
+				OS_TEST=`uname -m`
+				export OS_TEST
+
+				case $OS_TEST in
+
+					i86pc)
+						PATH=/h/solx86/export/home/opt/SUNWspro/SC3.0.1/bin:$PATH
+						export PATH
+						;;
+
+					*)
+						PATH=/tools/ns/workshop/bin:/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin:$PATH
+						export PATH
+						;;
+				esac
+
+				LD_LIBRARY_PATH=/share/builds/components/jdk/1.2.2_01/SunOS/lib/sparc/native_threads
+				export LD_LIBRARY_PATH
+
+				MANPATH=/usr/local/man:/usr/local/lib/mh/man:/usr/local/lib/rcscvs/man:/usr/local/lib/fvwm/man:/usr/local/lib/xscreensaver/man:/usr/share/man:/usr/openwin/man:/usr/opt/man
+				export MANPATH
+
+				# For Purify
+				PURIFYHOME=/usr/local-sparc-solaris/pure/purify-4.0-solaris2
+				export PURIFYHOME
+				PATH=/usr/local-sparc-solaris/pure/purify-4.0-solaris2:$PATH
+				export PATH
+				MANPATH=$PURIFYHOME/man:$MANPATH
+				export MANPATH
+				LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local-sparc-solaris/pure/purify-4.0-solaris2
+				export LD_LIBRARY_PATH
+				PURIFYOPTIONS="-max_threads=1000 -follow-child-processes=yes"
+				export PURIFYOPTIONS
+				;;
+		esac
+		;;
+
+	IRIX | IRIX64)
+		#############
+		#  SGI Irix
+		#
+
+		PATH=/share/builds/components/jdk/1.2.1/IRIX:/tools/ns/bin:/tools/contrib/bin:/usr/local/bin:/usr/sbin:/usr/bsd:/usr/bin:/bin:/etc:/usr/etc:/usr/bin/X11:.
+		export PATH
+		;;
+
+	UNIX_SV)
+		#################
+		# UNIX_SV
+		#
+
+		PATH=/usr/local/bin:/tools/ns/bin:/bin:/usr/bin:/usr/bin/X11:/X11/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/sbin:/usr/ccs/bin:.
+		export PATH
+		;;
+
+	AIX)
+		#################
+		#  IBM AIX
+		#
+
+		PATH=/share/builds/components/jdk/1.2.2/AIX:/usr/ucb/:/tools/ns-arch/rs6000_ibm_aix4.1/bin:/tools/ns-arch/rs6000_ibm_aix3.2.5/bin:/share/tools/ns/soft/cvs-1.8/run/default/rs6000_ibm_aix3.2.5/bin:/bin:/usr/bin:/usr/ccs/bin:/usr/sbin:/usr/local/bin:/usr/bin/X11:/usr/etc:/etc:/sbin:.
+		export PATH
+		;;
+
+	HP-UX)
+		#################
+		# HP UX
+		#
+
+		PATH=/share/builds/components/jdk/1.1.6/HP-UX:/usr/bin:/opt/ansic/bin:/usr/ccs/bin:/usr/contrib/bin:/opt/nettladm/bin:/opt/graphics/common/bin:/usr/bin/X11:/usr/contrib/bin/X11:/opt/upgrade/bin:/opt/CC/bin:/opt/aCC/bin:/opt/langtools/bin:/opt/imake/bin:/etc:/usr/etc:/usr/local/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sbin:/usr/local/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sbin:/usr/include/X11R5:.
+		export PATH
+		;;
+
+	SCO_SV)
+		#################
+		# SCO
+		#
+
+		PATH=/bin:/usr/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sco/bin:/usr/bin/X11:/usr/local/bin:.
+		export PATH
+		;;
+
+	FreeBSD)
+
+		#################
+		# FreeBSD
+		#
+
+		PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/java/bin:/usr/local/bin:/usr/ucb:/usr/ccs/bin:/tools/contrib/bin:/tools/ns/bin:.
+		export PATH
+		;;
+
+	OSF1)
+		#################
+		# DEC OSF1
+		#
+
+		PATH=/share/builds/components/jdk/1.2.2_3/OSF1:/tools/ns-arch/alpha_dec_osf4.0/bin:/tools/ns-arch/soft/cvs-1.8.3/run/default/alpha_dec_osf2.0/bin:/usr/local-alpha-osf/bin:/usr3/local/bin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/ucb:.
+		export PATH
+		;;
+
+	Linux)
+
+		#################
+		# Linux
+		#
+
+		PATH=/share/builds/components/jdk/1.2.2/Linux:$PATH
+		export PATH
+		;;
+esac
+
+###############################
+# Reset any "tracked" aliases #
+###############################
+
+hash -r

mozilla/security/coreconf/AIX.mk

@@ -32,7 +32,7 @@
 #
 # Config stuff for AIX.
 #
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 #
 # There are two implementation strategies available on AIX:
@@ -65,19 +65,10 @@ CPU_ARCH	= rs6000
 RANLIB		= ranlib
 
 OS_CFLAGS	= -DAIX -DSYSV
-ifndef NS_USE_GCC
+ifeq ($(CC),xlC_r)
 	OS_CFLAGS += -qarch=com
 endif
 
 AIX_WRAP	= $(DIST)/lib/aixwrap.o
 AIX_TMP		= $(OBJDIR)/_aix_tmp.o
-ifdef MAPFILE
-EXPORT_RULES = -bexport:$(MAPFILE)
-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
-endif
-
+OS_LIBS		+= -lsvld

mozilla/security/coreconf/AIX3.2.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for AIX3.2.5
 #
-include $(CORE_DEPTH)/coreconf/AIX.mk
+include $(CORECONF_SOURCE)/AIX.mk

mozilla/security/coreconf/AIX4.1.mk

@@ -33,7 +33,7 @@
 # Config stuff for AIX4.1
 #
 
-include $(CORE_DEPTH)/coreconf/AIX.mk
+include $(CORECONF_SOURCE)/AIX.mk
 
 
 AIX_LINK_OPTS  += -bnso -berok
@@ -44,12 +44,3 @@ AIX_LINK_OPTS  += -bnso -berok
 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
-

mozilla/security/coreconf/AIX4.2.mk

@@ -34,17 +34,12 @@
 # Config stuff for AIX4.2
 #
 
-include $(CORE_DEPTH)/coreconf/AIX.mk
+include $(CORECONF_SOURCE)/AIX.mk
 
 OS_CFLAGS	+= -DAIX4_2
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -L/usr/lpp/xlC/lib -lc -lm
+DSO_LDOPTS	= -brtl -bM:SRE -bnoentry $(EXPORT_RULES)
+MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -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
-
+EXPORT_RULES = -bexpall
 

mozilla/security/coreconf/AIX4.3.mk

@@ -33,7 +33,7 @@
 # Config stuff for AIX4.3
 #
 
-include $(CORE_DEPTH)/coreconf/AIX.mk
+include $(CORECONF_SOURCE)/AIX.mk
 
 
 ifeq ($(USE_64), 1)
@@ -44,12 +44,9 @@ ifeq ($(USE_64), 1)
 	export OBJECT_MODE
 endif
 OS_CFLAGS	+= -DAIX4_3
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
+DSO_LDOPTS	= -brtl -bM:SRE -bnoentry $(EXPORT_RULES)
+MKSHLIB		= $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
+
+OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
+EXPORT_RULES	= -bexpall
 
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif

mozilla/security/coreconf/AIX5.1.mk

@@ -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

mozilla/security/coreconf/AIX5.2.mk

@@ -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

mozilla/security/coreconf/BSD_OS.mk

@@ -33,7 +33,7 @@
 # Config stuff for BSD/OS
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER	= gcc
 CC			= gcc
@@ -77,11 +77,6 @@ DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
 endif
 
 MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 G++INCLUDES		= -I/usr/include/g++
 

mozilla/security/coreconf/BeOS.mk

@@ -1,79 +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) 2002 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 BeOS
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS)
-
-USE_PTHREADS = 
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = gcc
-
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -Dppc
-	CPU_ARCH	= ppc
-else
-	OS_REL_CFLAGS	= -Di386
-	CPU_ARCH	= x86
-endif
-
-MKSHLIB		= $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-	OPTIMIZER	= -O2
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -pipe
-OS_LIBS			= -lbe
-
-DEFINES			+= -DBEOS
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= beos
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		=
-DSO_LDFLAGS		=
-

mozilla/security/coreconf/Darwin.mk

@@ -1,78 +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 Darwin.
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC		= cc
-CCC		= c++
-RANLIB		= ranlib
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-OS_REL_CFLAGS	= -Di386
-CPU_ARCH	= i386
-else
-OS_REL_CFLAGS	= -Dppc
-CPU_ARCH	= ppc
-endif
-
-# "Commons" are tentative definitions in a global scope, like this:
-#     int x;
-# The meaning of a common is ambiguous.  It may be a true definition:
-#     int x = 0;
-# or it may be a declaration of a symbol defined in another file:
-#     extern int x;
-# Use the -fno-common option to force all commons to become true
-# definitions so that the linker can catch multiply-defined symbols.
-# Also, common symbols are not allowed with Darwin dynamic libraries.
-
-OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -no-cpp-precomp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ifdef BUILD_OPT
-OPTIMIZER	= -O2
-endif
-
-ARCH		= darwin
-
-# May override this with -bundle to create a loadable module.
-DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-
-MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
-DLL_SUFFIX	= dylib
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
-
-G++INCLUDES	= -I/usr/include/g++

mozilla/security/coreconf/FreeBSD.mk

@@ -33,7 +33,7 @@
 # Config stuff for FreeBSD
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER	= gcc
 CC			= gcc
@@ -43,22 +43,19 @@ RANLIB			= ranlib
 ifeq ($(OS_TEST),alpha)
 CPU_ARCH		= alpha
 else
+OS_REL_CFLAGS		= -Di386
 CPU_ARCH		= x86
 endif
 
-OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
 #
 # The default implementation strategy for FreeBSD is pthreads.
 #
 ifndef CLASSIC_NSPR
 USE_PTHREADS		= 1
-DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-OS_LIBS			+= -pthread
-DSO_LDOPTS		+= -pthread
+DEFINES			+= -D_THREAD_SAFE
+THREAD_FLAG		= -pthread
 endif
 
 ARCH			= freebsd
@@ -71,12 +68,11 @@ else
 DLL_SUFFIX		= so.1.0
 endif
 
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
+DSO_CFLAGS		= -fPIC
+DSO_LDOPTS		= -Bshareable
+DSO_LDFLAGS		=
+
+MKSHLIB			= $(LD) $(DSO_LDOPTS)
 
 G++INCLUDES		= -I/usr/include/g++
 

mozilla/security/coreconf/FreeBSD2.mk

@@ -1,5 +1,4 @@
-#! gmake
-# 
+#
 # 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
@@ -31,9 +30,7 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
+# Config stuff for FreeBSD2
+#
 
-include manifest.mn
-include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
-
+include $(CORECONF_SOURCE)/FreeBSD.mk

mozilla/security/coreconf/HP-UX.mk

@@ -34,7 +34,7 @@
 # Config stuff for HP-UX
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -42,7 +42,7 @@ CPU_ARCH   = hppa
 DLL_SUFFIX = sl
 CC         = cc
 CCC        = CC
-OS_CFLAGS  += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
+OS_CFLAGS  += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE
 
 ifeq ($(DEFAULT_IMPL_STRATEGY),_PTH)
 	USE_PTHREADS = 1
@@ -63,11 +63,6 @@ endif
 LDFLAGS			= -z -Wl,+s
 
 MKSHLIB			= $(LD) $(DSO_LDOPTS)
-ifdef MAPFILE
-MKSHLIB += -c $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-         sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
 
 DSO_LDOPTS		= -b +h $(notdir $@)
 DSO_LDFLAGS		=

mozilla/security/coreconf/HP-UXA.09.03.mk

@@ -41,4 +41,4 @@ endif
 #
 # Config stuff for HP-UXA.09.03
 #
-include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk
+include $(CORECONF_SOURCE)/HP-UXA.09.mk

mozilla/security/coreconf/HP-UXA.09.07.mk

@@ -40,4 +40,4 @@ endif
 #
 # Config stuff for HP-UXA.09.07
 #
-include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk
+include $(CORECONF_SOURCE)/HP-UXA.09.mk

mozilla/security/coreconf/HP-UXA.09.mk

@@ -33,6 +33,6 @@
 #
 # Config stuff for HP-UXA.09
 #
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
+include $(CORECONF_SOURCE)/HP-UX.mk
 
 OS_CFLAGS += -DHPUX9

mozilla/security/coreconf/HP-UXB.10.01.mk

@@ -37,4 +37,4 @@ endif
 #
 # Config stuff for HP-UXB.10.01
 #
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
+include $(CORECONF_SOURCE)/HP-UXB.10.mk

mozilla/security/coreconf/HP-UXB.10.10.mk

@@ -41,7 +41,7 @@ endif
 #
 # Config stuff for HP-UXB.10.10
 #
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
+include $(CORECONF_SOURCE)/HP-UXB.10.mk
 
 OS_CFLAGS += -DHPUX10_10
 

mozilla/security/coreconf/HP-UXB.10.20.mk

@@ -41,7 +41,7 @@ endif
 #
 # Config stuff for HP-UXB.10.20
 #
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
+include $(CORECONF_SOURCE)/HP-UXB.10.mk
 
 OS_CFLAGS		+= -DHPUX10_20
 

mozilla/security/coreconf/HP-UXB.10.30.mk

@@ -41,7 +41,7 @@ endif
 #
 # Config stuff for HP-UXB.10.30.
 #
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
+include $(CORECONF_SOURCE)/HP-UXB.10.mk
 
 OS_CFLAGS		+= -DHPUX10_30
 

mozilla/security/coreconf/HP-UXB.10.mk

@@ -32,7 +32,7 @@
 #
 # Config stuff for HP-UXB.10
 #
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
+include $(CORECONF_SOURCE)/HP-UX.mk
 
 OS_CFLAGS += -DHPUX10
 OS_LIBS   += -lpthread -lm

mozilla/security/coreconf/HP-UXB.11.00.mk

@@ -52,4 +52,4 @@ endif
 #
 # Config stuff for HP-UXB.11.00.
 #
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk
+include $(CORECONF_SOURCE)/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.11.mk

@@ -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) 2001 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.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.11)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.11.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.20.mk

@@ -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) 2002 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.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.20)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.x.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.22.mk

@@ -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) 2002 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.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.22)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.x.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.mk

@@ -32,7 +32,7 @@
 #
 # Config stuff for HP-UXB.11
 #
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
+include $(CORECONF_SOURCE)/HP-UX.mk
 
 ifdef USE_LONG_LONGS
 USE_HYBRID = 1
@@ -41,36 +41,14 @@ endif
 ifndef NS_USE_GCC
     CCC                 = /opt/aCC/bin/aCC -ext
     ifeq ($(USE_64), 1)
-	ifeq ($(OS_TEST), ia64)
-	    OS_CFLAGS	+= -Aa +e +p +DD64
-	else
-	    # Our HP-UX build machine has a strange problem.  If
-	    # a 64-bit PA-RISC executable calls getcwd() in a
-	    # network-mounted directory, it fails with ENOENT.
-	    # We don't know why.  Since nsinstall calls getcwd(),
-	    # this breaks our 64-bit HP-UX nightly builds.  None
-	    # of our other HP-UX machines have this problem.
-	    #
-	    # We worked around this problem by building nsinstall
-	    # as a 32-bit PA-RISC executable for 64-bit PA-RISC
-	    # builds.  -- wtc 2003-06-03
-	    ifdef INTERNAL_TOOLS
-	    OS_CFLAGS	+= +DAportable +DS2.0
-	    else
-	    OS_CFLAGS	+= -Aa +e +DA2.0W +DS2.0 +DChpux
-	    endif
-	endif
+	OS_CFLAGS       +=  -Aa +e +DA2.0W +DS2.0 +DChpux
 # Next line replaced by generic name handling in arch.mk
 #	COMPILER_TAG    = _64
     else
-	ifeq ($(OS_TEST), ia64)
-	    OS_CFLAGS	+= -Aa +e +p +DD32
+	ifdef USE_HYBRID
+	    OS_CFLAGS 	+= -Aa +e +DA2.0 +DS2.0 
 	else
-	    ifdef USE_HYBRID
-		OS_CFLAGS += -Aa +e +DA2.0 +DS2.0 
-	    else
-		OS_CFLAGS += +DAportable +DS2.0
-	    endif
+	    OS_CFLAGS   += +DAportable +DS2.0
 	endif
     endif
 else

mozilla/security/coreconf/IRIX.mk

@@ -33,7 +33,7 @@
 # Config stuff for IRIX
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 #
 # The default implementation strategy for Irix is classic nspr.
@@ -58,7 +58,7 @@ ifdef NS_USE_GCC
 else
 	CC	= cc
 	CCC		= CC
-	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
+	ODD_CFLAGS	= -fullwarn -xansi
 	ifdef BUILD_OPT
 		ifeq ($(USE_N32),1)
 			OPTIMIZER	= -O -OPT:Olimit=4000
@@ -91,9 +91,10 @@ RANLIB		= /bin/true
 # NOTE: should always define _SGI_MP_SOURCE
 NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
 
-OS_CFLAGS += $(NOMD_OS_CFLAGS)
-ifdef USE_MDUPDATE
-	OS_CFLAGS += -MDupdate $(DEPENDENCIES)
+ifndef NO_MDUPDATE
+	OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
+else
+	OS_CFLAGS += $(NOMD_OS_CFLAGS)
 endif
 
 ifeq ($(USE_N32),1)
@@ -101,11 +102,6 @@ ifeq ($(USE_N32),1)
 endif
 
 MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 DSO_LDOPTS	= -elf -shared -all
 

mozilla/security/coreconf/IRIX5.2.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for IRIX 5.2
 #
-include $(CORE_DEPTH)/coreconf/IRIX5.mk
+include $(CORECONF_SOURCE)/IRIX5.mk

mozilla/security/coreconf/IRIX5.3.mk

@@ -32,6 +32,6 @@
 #
 # Config stuff for IRIX 5.3
 #
-include $(CORE_DEPTH)/coreconf/IRIX5.mk
+include $(CORECONF_SOURCE)/IRIX5.mk
 
 OS_CFLAGS += -DIRIX5_3

mozilla/security/coreconf/IRIX5.mk

@@ -33,7 +33,7 @@
 # Config stuff for IRIX 5
 #
 
-include $(CORE_DEPTH)/coreconf/IRIX.mk
+include $(CORECONF_SOURCE)/IRIX.mk
 
 ifndef NS_USE_GCC
 	ODD_CFLAGS += -xgot

mozilla/security/coreconf/IRIX6.2.mk

@@ -38,6 +38,6 @@
 
 SHLIB_LD_OPTS += -no_unresolved
 
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
+include $(CORECONF_SOURCE)/IRIX6.mk
 
 OS_CFLAGS += -DIRIX6_2

mozilla/security/coreconf/IRIX6.3.mk

@@ -37,6 +37,6 @@
 
 SHLIB_LD_OPTS += -no_unresolved
 
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
+include $(CORECONF_SOURCE)/IRIX6.mk
 
 OS_CFLAGS += -DIRIX6_3

mozilla/security/coreconf/IRIX6.5.mk

@@ -37,9 +37,6 @@
 
 SHLIB_LD_OPTS += -no_unresolved
 
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
+include $(CORECONF_SOURCE)/IRIX6.mk
 
-OS_CFLAGS += -DIRIX6_5
-ifndef NS_USE_GCC
-OS_CFLAGS += -mips3
-endif
+OS_CFLAGS += -DIRIX6_5 -mips3

mozilla/security/coreconf/IRIX6.mk

@@ -33,7 +33,7 @@
 # Config stuff for IRIX 6
 #
 
-include $(CORE_DEPTH)/coreconf/IRIX.mk
+include $(CORECONF_SOURCE)/IRIX.mk
 
 ifndef NS_USE_GCC
 	ifneq ($(USE_N32),1)

mozilla/security/coreconf/Linux.mk

@@ -33,7 +33,7 @@
 # Config stuff for Linux
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 #
 # The default implementation strategy for Linux is now pthreads
@@ -50,10 +50,6 @@ RANLIB			= ranlib
 
 DEFAULT_COMPILER = gcc
 
-ifeq ($(OS_TEST),m68k)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= m68k
-else		
 ifeq ($(OS_TEST),ppc)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ppc
@@ -62,10 +58,6 @@ ifeq ($(OS_TEST),alpha)
         OS_REL_CFLAGS   = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= alpha
 else
-ifeq ($(OS_TEST),ia64)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= ia64
-else
 ifeq ($(OS_TEST),sparc)
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = sparc
@@ -73,26 +65,6 @@ else
 ifeq ($(OS_TEST),sparc64)
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH        = sparc
-else
-ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = arm
-else
-ifeq ($(OS_TEST),parisc64)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = hppa
-else
-ifeq ($(OS_TEST),s390)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390
-else
-ifeq ($(OS_TEST),s390x)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390x
-else
-ifeq ($(OS_TEST),mips)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = mips
 else
 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 	CPU_ARCH	= x86
@@ -100,13 +72,6 @@ endif
 endif
 endif
 endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
 
 
 LIBC_TAG		= _glibc
@@ -117,11 +82,6 @@ ifeq ($(OS_RELEASE),2.0)
 	ifdef BUILD_OPT
 		OPTIMIZER	= -O2
 	endif
-	ifdef MAPFILE
-		MKSHLIB += -Wl,--version-script,$(MAPFILE)
-	endif
-	PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-         sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
 
 ifeq ($(USE_PTHREADS),1)
@@ -143,8 +103,3 @@ DSO_LDFLAGS		=
 
 # INCLUDES += -I/usr/include -Y/usr/include/linux
 G++INCLUDES		= -I/usr/include/g++
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)

mozilla/security/coreconf/Linux2.1.mk

@@ -33,17 +33,12 @@
 # Config stuff for Linux 2.1 (ELF)
 #
 
-include $(CORE_DEPTH)/coreconf/Linux.mk
+include $(CORECONF_SOURCE)/Linux.mk
 ifeq ($(OS_RELEASE),2.1)
         OS_REL_CFLAGS   += -DLINUX2_1
         MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
         ifdef BUILD_OPT
                 OPTIMIZER       = -O2
         endif
-	ifdef MAPFILE
-		MKSHLIB += -Wl,--version-script,$(MAPFILE)
-	endif
-	PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-       	 sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
 

mozilla/security/coreconf/Linux2.2.mk

@@ -33,7 +33,7 @@
 # Config stuff for Linux 2.2 (ELF)
 #
 
-include $(CORE_DEPTH)/coreconf/Linux.mk
+include $(CORECONF_SOURCE)/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
@@ -41,9 +41,3 @@ ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif
 
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.4.mk

@@ -33,7 +33,7 @@
 # Config stuff for Linux 2.4 (ELF)
 #
 
-include $(CORE_DEPTH)/coreconf/Linux.mk
+include $(CORECONF_SOURCE)/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
@@ -41,9 +41,3 @@ ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif
 
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.5.mk

@@ -1,49 +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 Linux 2.5 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.6.mk

@@ -1,49 +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 Linux 2.6 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/LinuxELF1.2.mk

@@ -33,4 +33,4 @@
 # Config stuff for Linux 1.2 (ELF)
 #
 
-include $(CORE_DEPTH)/coreconf/Linux.mk
+include $(CORECONF_SOURCE)/Linux.mk

mozilla/security/coreconf/LinuxELF2.0.mk

@@ -33,4 +33,4 @@
 # Config stuff for Linux 2.0 (ELF)
 #
 
-include $(CORE_DEPTH)/coreconf/Linux.mk
+include $(CORECONF_SOURCE)/Linux.mk

mozilla/security/coreconf/Makefile.in

@@ -30,14 +30,16 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-DEPTH		= ..
-CORE_DEPTH	= ..
 
-MODULE		= coreconf
+CORE_DEPTH	= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@:$(CORECONF_SOURCE)
 
 DIRS		= nsinstall
 
-include $(DEPTH)/coreconf/config.mk
-include $(DEPTH)/coreconf/rules.mk
+include autoconf.mk
 
-export:: libs
+include $(CORECONF_SOURCE)/config.mk
+
+include $(CORECONF_SOURCE)/rules.mk

mozilla/security/coreconf/NCR3.0.mk

@@ -33,7 +33,7 @@
 # Config stuff for NCR SysVr4 v 3.0
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -66,11 +66,6 @@ endif
 MKSHLIB     += $(LD) $(DSO_LDOPTS)
 #DSO_LDOPTS += -G -z defs
 DSO_LDOPTS += -G
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 CPU_ARCH    = x86
 ARCH        = ncr

mozilla/security/coreconf/NEC4.2.mk

@@ -33,7 +33,7 @@
 # Config stuff for NEC Mips SYSV
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc
 
@@ -49,11 +49,6 @@ CCC			= g++
 endif
 
 MKSHLIB			= $(LD) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 RANLIB			= /bin/true
 

mozilla/security/coreconf/NetBSD.mk

@@ -33,18 +33,15 @@
 # Config stuff for NetBSD
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER	= gcc
 CC			= gcc
 CCC			= g++
 RANLIB			= ranlib
 
-CPU_ARCH		:= $(shell uname -p)
-ifeq ($(CPU_ARCH),i386)
 OS_REL_CFLAGS		= -Di386
 CPU_ARCH		= x86
-endif
 
 ifndef OBJECT_FMT
 OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
@@ -74,12 +71,6 @@ DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
 endif
 
 MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
 
 G++INCLUDES		= -I/usr/include/g++
 

mozilla/security/coreconf/OS2.mk

@@ -49,31 +49,29 @@ endif
 # XP_OS2 is strictly for OS2 only
 XP_DEFINE  += -DXP_PC=1  -DXP_OS2=1
 
-# Override prefix
-LIB_PREFIX  = $(NULL)
-
 # Override suffix in suffix.mk
 LIB_SUFFIX  = lib
 DLL_SUFFIX  = dll
+OBJ_SUFFIX  = .obj
+ASM_SUFFIX  = .asm
 PROG_SUFFIX = .exe
 
 
 ifdef XP_OS2_EMX
 
+#
+# On OS/2 we proudly support gbash...
+#
+SHELL = GBASH.EXE
 CCC			= gcc
 LINK			= gcc
-AR                      = emxomfar r $@
+AR                      = emxomfar -p256 r $@
 # 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			= emximp -o
-FILTER			= emxexp -o
-
-# GCC for OS/2 currently predefines these, but we don't want them
-DEFINES 		+= -Uunix -U__unix -U__unix__
-
-DEFINES			+= -DTCPV40HDRS
+IMPLIB    = emximp -o
+FILTER    = emxexp
 
 ifndef NO_SHARED_LIB
 WRAP_MALLOC_LIB         = 
@@ -84,25 +82,13 @@ MKSHLIB                 = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@
 MKCSHLIB                = $(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@
 MKSHLIB_FORCE_ALL       = 
 MKSHLIB_UNFORCE_ALL     = 
-DSO_LDOPTS              = -Zomf -Zdll
+DSO_LDOPTS              = -Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO
+# 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 ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,\([\t ]*\),\1_,' | \
-	awk 'BEGIN {ord=1;} { print($$0 " @" ord " RESIDENTNAME"); ord++;}' >> $@
-
 endif   #NO_SHARED_LIB
 
-OS_CFLAGS          = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zomf -DDEBUG -DTRACING -g
+OS_CFLAGS          = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zmtd -Zomf -Zmt  -DDEBUG -DDEBUG_wintrinh -DTRACING -g
 
 # Where the libraries are
 MOZ_COMPONENT_NSPR_LIBS=-L$(DIST)/lib $(NSPR_LIBS)
@@ -111,7 +97,7 @@ NSPR_INCLUDE_DIR =
 
 
 ifdef BUILD_OPT
-OPTIMIZER		= -O2 -s
+OPTIMIZER		= -O6 
 DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
 DLLFLAGS		= -DLL -OUT:$@ -MAP:$(@:.dll=.map)
 EXEFLAGS    		= -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
@@ -127,16 +113,10 @@ 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
+#
+# On OS/2 we proudly support gbash...
+#
+SHELL = GBASH.EXE
 CCC			= icc -q -DXP_OS2 -DOS2=4 -N10
 LINK			= -ilink
 AR		= -ilib /NOL /NOI /O:$(subst /,\\,$@)
@@ -160,21 +140,10 @@ 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 ';+' $(LIBRARY_NAME).def | 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
+INCLUDES        += -I$(MOD_DEPTH)/../../dist/include
 DEFINES         += -DXP_OS2_VACPP -DTCPV40HDRS
 
 # Where the libraries are
@@ -183,22 +152,20 @@ MOZ_COMPONENT_NSPR_LIBS=-L$(DIST)/lib $(NSPR_LIBS)
 NSPR_INCLUDE_DIR =   
 
 
-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
+OPTIMIZER		= -O+ -Oi 
 DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
+DLLFLAGS		= /DLL /O:$@ /INC:_dllentry /MAP:$(@:.dll=.map)
+EXEFLAGS    		= -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
 OBJDIR_TAG 		= _OPT
-LDFLAGS     += /NODEBUG /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA
+LDFLAGS     = /FREE /NODEBUG /NOE /LINENUMBERS /nologo
 else
 OS_CFLAGS   += /Ti+
 DEFINES 		+= -DDEBUG -D_DEBUG -DDEBUGPRINTS     #HCT Need += to avoid overidding manifest.mn 
-DLLFLAGS    += /DE
-EXEFLAGS    += /DE
+DLLFLAGS		= /DEBUG /DLL /O:$@ /INC:_dllentry /MAP:$(@:.dll=.map)
+EXEFLAGS    		= -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
 OBJDIR_TAG 		= _DBG
-LDFLAGS     += /DE
+LDFLAGS 		= /FREE /DE /NOE /LINENUMBERS /nologo 
 endif   # BUILD_OPT
 
 endif   # XP_OS2_VACPP
@@ -206,16 +173,12 @@ 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
 
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
-endif
+NSINSTALL_DIR  = $(CORECONF_SOURCE)/nsinstall
 # NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
 NSINSTALL 	= nsinstall             # HCT4OS2
 INSTALL		= $(NSINSTALL)
 
-MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
+MKDEPEND_DIR    = $(CORECONF_SOURCE)/mkdepend
 MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
 MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk
 
@@ -248,29 +211,6 @@ else
 	endif
 endif
 
-DEFINES += -DXP_OS2
-
 define MAKE_OBJDIR
 if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
 endef
-
-#
-# override the definition of DLL_PREFIX in prefix.mk
-#
-
-ifndef DLL_PREFIX
-    DLL_PREFIX = $(NULL)
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
-    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif
-
-
-ifdef LIBRARY_NAME
-    IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
-endif
-

mozilla/security/coreconf/OSF1.mk

@@ -40,7 +40,7 @@
 #
 SHELL = /usr/bin/ksh
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -63,10 +63,4 @@ endif
 
 # The command to build a shared library on OSF1.
 MKSHLIB    += ld -shared -expect_unresolved "*" -soname $(notdir $@)
-ifdef MAPFILE
-MKSHLIB += -hidden -input $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
- sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@
-
 DSO_LDOPTS += -shared

mozilla/security/coreconf/OSF1V2.0.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for DEC OSF/1 V2.0
 #
-include $(CORE_DEPTH)/coreconf/OSF1.mk
+include $(CORECONF_SOURCE)/OSF1.mk

mozilla/security/coreconf/OSF1V3.0.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for DEC OSF/1 V3.0
 #
-include $(CORE_DEPTH)/coreconf/OSF1.mk
+include $(CORECONF_SOURCE)/OSF1.mk

mozilla/security/coreconf/OSF1V3.2.mk

@@ -37,7 +37,7 @@
 #
 # Config stuff for DEC OSF/1 V3.2
 #
-include $(CORE_DEPTH)/coreconf/OSF1.mk
+include $(CORECONF_SOURCE)/OSF1.mk
 
 ifeq ($(OS_RELEASE),V3.2)
 	OS_CFLAGS += -DOSF1V3

mozilla/security/coreconf/OSF1V4.0.mk

@@ -44,7 +44,7 @@ endif
 #
 # Config stuff for DEC OSF/1 V4.0
 #
-include $(CORE_DEPTH)/coreconf/OSF1.mk
+include $(CORECONF_SOURCE)/OSF1.mk
 
 ifeq ($(OS_RELEASE),V4.0)
 	OS_CFLAGS += -DOSF1V4

mozilla/security/coreconf/OSF1V4.0B.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for DEC OSF/1 V4.0B
 #
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
+include $(CORECONF_SOURCE)/OSF1V4.0.mk

mozilla/security/coreconf/OSF1V4.0D.mk

@@ -32,7 +32,7 @@
 #
 # Config stuff for DEC OSF/1 V4.0D
 #
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
+include $(CORECONF_SOURCE)/OSF1V4.0.mk
 DEFINES	+= -DOSF1V4D
 
 OS_LIBS += -lpthread -lrt

mozilla/security/coreconf/OSF1V5.0.mk

@@ -44,4 +44,4 @@ endif
 #
 # Config stuff for DEC OSF/1 V5.0
 #
-include $(CORE_DEPTH)/coreconf/OSF1.mk
+include $(CORECONF_SOURCE)/OSF1.mk

mozilla/security/coreconf/OSF1V5.1.mk

@@ -1,47 +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) 2001 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.
-#
-# On OSF1 V5.1, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-#
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.1
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk

mozilla/security/coreconf/OpenBSD.mk

@@ -1,69 +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 OpenBSD 
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-CPU_ARCH		:= $(shell uname -p)
-ifeq ($(CPU_ARCH),i386)
-OS_REL_CFLAGS		= -Di386
-CPU_ARCH		= x86
-endif
-
-ifndef CLASSIC_NSPR
-USE_PTHREADS		= 1
-DEFINES			+= -D_THREAD_SAFE -pthread
-OS_LIBS			+= -pthread
-DSO_LDOPTS		+= -pthread
-endif
-
-DLL_SUFFIX		= so.1.0
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
-
-OS_LIBS			= 
-
-ARCH			= openbsd
-
-DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-DSO_LDFLAGS		=
-
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-

mozilla/security/coreconf/OpenUNIX.mk

@@ -1,91 +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 Open UNIX 8.
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = gcc
-
-CC         = gcc
-OS_CFLAGS += -fPIC
-CCC        = g++
-CCC       += -DPRFSTREAMS_BROKEN -I/usr/gnu/lib/g++-include
-# CCC      = $(CORE_DEPTH)/build/hcpp
-# CCC     += +.cpp +w
-RANLIB     = /bin/true
-
-#
-# -DSCO_PM - Policy Manager AKA: SCO Licensing
-# -DSCO - Changes to Netscape source (consistent with AIX, LINUX, etc..)
-# -Dsco - Needed for /usr/include/X11/*
-#
-OS_CFLAGS   += -DSCO_SV -DSYSV -D_SVID3 -DHAVE_STRERROR -DSW_THREADS -DSCO_PM -DSCO -Dsco
-#OS_LIBS     += -lpmapi -lsocket -lc
-MKSHLIB      = $(LD)
-MKSHLIB     += $(DSO_LDOPTS)
-XINC         = /usr/include/X11
-MOTIFLIB    += -lXm
-INCLUDES    += -I$(XINC)
-CPU_ARCH     = x86
-GFX_ARCH     = x
-ARCH         = sco
-LOCALE_MAP   = $(CORE_DEPTH)/cmd/xfe/intl/sco.lm
-EN_LOCALE    = C
-DE_LOCALE    = de_DE.ISO8859-1
-FR_LOCALE    = fr_FR.ISO8859-1
-JP_LOCALE    = ja
-SJIS_LOCALE  = ja_JP.SJIS
-KR_LOCALE    = ko_KR.EUC
-CN_LOCALE    = zh
-TW_LOCALE    = zh
-I2_LOCALE    = i2
-LOC_LIB_DIR  = /usr/lib/X11
-NOSUCHFILE   = /solaris-rm-f-sucks
-BSDECHO      = /bin/echo
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-#
-# These defines are for building unix plugins
-#
-BUILD_UNIX_PLUGINS  = 1
-#DSO_LDOPTS         += -b elf -G -z defs
-DSO_LDOPTS         += -G
-DSO_LDFLAGS        += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen
-
-# Used for Java compiler
-EXPORT_FLAGS += -W l,-Bexport

mozilla/security/coreconf/OpenVMS.mk

@@ -19,17 +19,25 @@
 # Config stuff for Compaq OpenVMS
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
-CC			= cc
+ifdef INTERNAL_TOOLS
+CC			= c89
 CCC			= cxx
+OPTIMIZER		= -O
+else
+CC			= ccc
+CCC			= ccc
+endif
 
-RANLIB			= /gnu/bin/true
+RANLIB			= /bin/true
 
 CPU_ARCH		:= $(shell uname -Wh)
 
-OS_CFLAGS		= -DVMS
-OS_CXXFLAGS		= -DVMS
+OS_CFLAGS              = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
+                         -DGENERIC_PTHREAD_REDEFINES -DNO_UDSOCK
+OS_CXXFLAGS            = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
+                         -DGENERIC_PTHREAD_REDEFINES -DNO_UDSOCK
 
 # Maybe this should go into rules.mk or something?
 ifdef NSPR_INCLUDE_DIR
@@ -44,17 +52,5 @@ endif
 #
 XCFLAGS                        += $(OPTIMIZER)
 
-DSO_LDOPTS	= -shared -auto_symvec
-MKSHLIB		= $(CC) $(OPTIMIZER) $(LDFLAGS) $(DSO_LDOPTS)
-
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)
+# The command to build a shared library in POSIX on OpenVMS.
+MKSHLIB = vmsld_psm $(OPTIMIZER)

mozilla/security/coreconf/OpenVMSV7.1-2.mk

@@ -19,4 +19,4 @@
 # Config stuff for Compaq OpenVMS
 #
 
-include $(CORE_DEPTH)/coreconf/OpenVMS.mk
+include $(CORECONF_SOURCE)/OpenVMS.mk

mozilla/security/coreconf/QNX.mk

@@ -1,70 +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) 2001 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 QNX
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-USE_PTHREADS = 1
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= qcc
-CCC			= qcc
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = qcc
-ifeq ($(OS_TEST),mips)
-	CPU_ARCH	= mips
-else
-	CPU_ARCH	= x86
-endif
-
-MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-	OPTIMIZER	= -O2
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Vgcc_ntox86 -Wall -pipe -DNTO -DHAVE_STRERROR -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=500
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= QNX
-
-DSO_CFLAGS		= -Wc,-fPIC
-DSO_LDOPTS		= -shared
-DSO_LDFLAGS		=

mozilla/security/coreconf/README

@@ -232,6 +232,9 @@ OVERVIEW of "config.mk":
         $(OS_CONFIG).mk         <architecture>-specific macros
                                 (dependent upon <architecture> tags)
 
+        platform.mk             source and release <platform> tags 
+				(dependent upon <architecture> tags)
+
         tree.mk                 release <tree> tags 
 				(dependent upon <architecture> tags)
 

mozilla/security/coreconf/ReliantUNIX.mk

@@ -33,7 +33,7 @@
 # Config stuff for ReliantUNIX
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -65,11 +65,6 @@ else
 	MKSHLIB    += -G -h $(@:$(OBJDIR)/%.so=%.so)
 	DSO_LDOPTS += -G -W l,-Blargedynsym
 endif
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 NOSUCHFILE  = /sni-rm-f-sucks
 ODD_CFLAGS += -DSVR4 -DSNI -DRELIANTUNIX

mozilla/security/coreconf/ReliantUNIX5.4.mk

@@ -32,4 +32,4 @@
 #
 # Config stuff for ReliantUNIX5.4
 #
-include $(CORE_DEPTH)/coreconf/ReliantUNIX.mk
+include $(CORECONF_SOURCE)/ReliantUNIX.mk

mozilla/security/coreconf/SCOOS5.0.mk

@@ -33,4 +33,4 @@
 # Config stuff for SCO OpenServer 5.0 for x86.
 #
 
-include $(CORE_DEPTH)/coreconf/SCO_SV3.2.mk
+include $(CORECONF_SOURCE)/SCO_SV3.2.mk

mozilla/security/coreconf/SCO_SV3.2.mk

@@ -33,7 +33,7 @@
 # Config stuff for SCO Unix for x86.
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -73,11 +73,6 @@ I2_LOCALE    = i2
 LOC_LIB_DIR  = /usr/lib/X11
 NOSUCHFILE   = /solaris-rm-f-sucks
 BSDECHO      = /bin/echo
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
 
 #
 # These defines are for building unix plugins

mozilla/security/coreconf/SunOS4.1.3_U1.mk

@@ -33,7 +33,7 @@
 # Config stuff for SunOS4.1
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 

mozilla/security/coreconf/SunOS5.10.mk

@@ -1,44 +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 SunOS5.10
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.10)
-	OS_DEFINES += -DSOLARIS2_10
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc 

mozilla/security/coreconf/SunOS5.10_i86pc.mk

@@ -1,48 +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 Solaris 10 on x86
-# 
-
-SOL_CFLAGS	= -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
-
-ifeq ($(OS_RELEASE),5.10_i86pc)
-	OS_DEFINES += -DSOLARIS2_10
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc

mozilla/security/coreconf/SunOS5.3.mk

@@ -35,4 +35,4 @@
 
 SOL_CFLAGS =
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk

mozilla/security/coreconf/SunOS5.4.mk

@@ -35,4 +35,4 @@
 
 SOL_CFLAGS =
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk

mozilla/security/coreconf/SunOS5.4_i86pc.mk

@@ -33,7 +33,7 @@
 # Config stuff for Solaris 2.4 on x86
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = cc
 
@@ -43,9 +43,10 @@ ifdef NS_USE_GCC
 	CCC		= g++
 	CCC		+= -Wall -Wno-format
 	ASFLAGS		+= -x assembler-with-cpp
-	OS_CFLAGS	+= $(NOMD_OS_CFLAGS)
-	ifdef USE_MDUPDATE
-		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
+	ifdef NO_MDUPDATE
+		OS_CFLAGS += $(NOMD_OS_CFLAGS)
+	else
+		OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
 	endif
 else
 	CC		= cc

mozilla/security/coreconf/SunOS5.5.1.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.5.1)
 	OS_DEFINES += -DSOLARIS2_5

mozilla/security/coreconf/SunOS5.5.1_i86pc.mk

@@ -35,10 +35,9 @@
 
 SOL_CFLAGS	= -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 CPU_ARCH		= x86
-ARCHFLAG		=
 OS_DEFINES		+= -Di386
 
 ifeq ($(OS_RELEASE),5.5.1_i86pc)

mozilla/security/coreconf/SunOS5.5.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.5)
 	OS_DEFINES += -DSOLARIS2_5

mozilla/security/coreconf/SunOS5.6.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.6)
 	OS_DEFINES += -DSOLARIS2_6

mozilla/security/coreconf/SunOS5.6_i86pc.mk

@@ -35,10 +35,9 @@
 
 SOL_CFLAGS	= -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 CPU_ARCH		= x86
-ARCHFLAG		=
 OS_DEFINES		+= -Di386
 
 ifeq ($(OS_RELEASE),5.6_i86pc)

mozilla/security/coreconf/SunOS5.7.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.7)
 	OS_DEFINES += -DSOLARIS2_7

mozilla/security/coreconf/SunOS5.7_i86pc.mk

@@ -35,10 +35,9 @@
 
 SOL_CFLAGS	= -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 CPU_ARCH		= x86
-ARCHFLAG		=
 OS_DEFINES		+= -Di386
 
 ifeq ($(OS_RELEASE),5.7_i86pc)

mozilla/security/coreconf/SunOS5.8.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.8)
 	OS_DEFINES += -DSOLARIS2_8

mozilla/security/coreconf/SunOS5.8_i86pc.mk

@@ -35,10 +35,9 @@
 
 SOL_CFLAGS	= -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 CPU_ARCH		= x86
-ARCHFLAG		=
 OS_DEFINES		+= -Di386
 
 ifeq ($(OS_RELEASE),5.8_i86pc)

mozilla/security/coreconf/SunOS5.9.mk

@@ -35,7 +35,7 @@
 
 SOL_CFLAGS += -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 ifeq ($(OS_RELEASE),5.9)
 	OS_DEFINES += -DSOLARIS2_9

mozilla/security/coreconf/SunOS5.9_i86pc.mk

@@ -35,10 +35,9 @@
 
 SOL_CFLAGS	= -D_SVID_GETTOD
 
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
+include $(CORECONF_SOURCE)/SunOS5.mk
 
 CPU_ARCH		= x86
-ARCHFLAG		=
 OS_DEFINES		+= -Di386
 
 ifeq ($(OS_RELEASE),5.9_i86pc)

mozilla/security/coreconf/SunOS5.mk

@@ -33,7 +33,7 @@
 # Config stuff for SunOS5.x
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 #
 # Temporary define for the Client; to be removed when binary release is used
@@ -57,6 +57,7 @@ ifeq ($(USE_64), 1)
   else
       ARCHFLAG=-xarch=v9
   endif
+      LD=/usr/ccs/bin/ld
 else
   ifdef NS_USE_GCC
     ifdef USE_HYBRID
@@ -99,9 +100,10 @@ ifdef NS_USE_GCC
 	CCC        = g++
 	CCC       += -Wall -Wno-format
 	ASFLAGS	  += -x assembler-with-cpp
-	OS_CFLAGS += $(NOMD_OS_CFLAGS)
-	ifdef USE_MDUPDATE
-		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
+	ifdef NO_MDUPDATE
+		OS_CFLAGS += $(NOMD_OS_CFLAGS)
+	else
+		OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
 	endif
 	OS_CFLAGS += $(ARCHFLAG)
 else
@@ -111,8 +113,8 @@ else
 	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
 	ifndef BUILD_OPT
 		OS_CFLAGS  += -xs
-	else
-		OPTIMIZER = -xO4
+#	else
+#		OPTIMIZER += -fast
 	endif
 
 endif
@@ -130,40 +132,12 @@ endif
 # Purify doesn't like -MDupdate
 NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
 
-MKSHLIB  = $(CC) $(DSO_LDOPTS)
-ifdef NS_USE_GCC
-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
-	GCC_USE_GNU_LD = 1
-endif
-endif
-ifdef MAPFILE
-ifdef NS_USE_GCC
-ifdef GCC_USE_GNU_LD
-    MKSHLIB += -Wl,--version-script,$(MAPFILE)
-else
-    MKSHLIB += -Wl,-M,$(MAPFILE)
-endif
-else
-    MKSHLIB += -M $(MAPFILE)
-endif
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-         sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-
-
-
+MKSHLIB  = $(LD) $(DSO_LDOPTS)
 
 # ld options:
 # -G: produce a shared object
 # -z defs: no unresolved symbols allowed
-ifdef NS_USE_GCC
-	DSO_LDOPTS += -shared -h $(notdir $@)
-else
-ifeq ($(USE_64), 1)
-	DSO_LDOPTS += -xarch=v9
-endif
-	DSO_LDOPTS += -G -h $(notdir $@)
-endif
+DSO_LDOPTS += -G -h $(notdir $@)
 
 # -KPIC generates position independent code for use in shared libraries.
 # (Similarly for -fPIC in case of gcc.)

mozilla/security/coreconf/UNIX.mk

@@ -46,15 +46,10 @@ else
 	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
 endif
 
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-NSINSTALL      = $(BUILD_TREE)/nss/nsinstall
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
+NSINSTALL_DIR  = $(MOD_DEPTH)/coreconf/nsinstall
 NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
-endif
 
-MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
+MKDEPEND_DIR    = $(MOD_DEPTH)/coreconf/mkdepend
 MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
 MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk
 

mozilla/security/coreconf/UNIXWARE2.1.mk

@@ -35,7 +35,7 @@
 # Config stuff for SCO Unixware 2.1
 #
 
-include $(CORE_DEPTH)/coreconf/UNIX.mk
+include $(CORECONF_SOURCE)/UNIX.mk
 
 DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc
 
@@ -49,9 +49,3 @@ DSO_LDOPTS += -G
 CPU_ARCH    = x86
 ARCH        = sco
 NOSUCHFILE  = /solaris-rm-f-sucks
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-

mozilla/security/coreconf/WIN16.mk

@@ -73,7 +73,7 @@ RC           = wrc.exe
 RC          += /r /dWIN16=1 /bt=windows
 RANLIB       = echo
 BSDECHO      = echo
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
+NSINSTALL_DIR  = $(CORECONF_SOURCE)/nsinstall
 NSINSTALL      = nsinstall
 INSTALL	     = $(NSINSTALL)
 MAKE_OBJDIR  = mkdir
@@ -109,101 +109,9 @@ OS_DLL_OPTION = CASEEXACT
 OS_DLLFLAGS  =
 OS_LIBS      =
 W16_EXPORTS  = #
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = copy $(LIBRARY_NAME).def $@
-
 
 #
 #  The following is NOT needed for the NSPR 2.0 library.
 #
 
 OS_CFLAGS += -d_WINDOWS -d_MSC_VER=700
-
-#
-# override the definitions of RELEASE_TREE found in tree.mk
-#
-ifndef RELEASE_TREE
-    ifdef BUILD_SHIP
-	ifdef USE_SHIPS
-	    RELEASE_TREE = $(NTBUILD_SHIP)
-	else
-	    RELEASE_TREE = //redbuild/components
-	endif
-    else
-	RELEASE_TREE = //redbuild/components
-    endif
-endif
-
-#
-# override the definitions of LIB_PREFIX and DLL_PREFIX in prefix.mk
-#
-ifndef LIB_PREFIX
-    LIB_PREFIX =  $(NULL)
-endif
-
-ifndef DLL_PREFIX
-    DLL_PREFIX =  $(NULL)
-endif
-
-#
-# override the definitions of various _SUFFIX symbols in suffix.mk
-#
-
-#
-# Object suffixes
-#
-ifndef OBJ_SUFFIX
-    OBJ_SUFFIX = .obj
-endif
-
-#
-# Assembler source suffixes
-#
-ifndef ASM_SUFFIX
-    ASM_SUFFIX = .asm
-endif
-
-#
-# Library suffixes
-#
-ifndef IMPORT_LIB_SUFFIX
-    IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
-endif
-
-ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
-    DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
-endif
-
-#
-# Program suffixes
-#
-ifndef PROG_SUFFIX
-    PROG_SUFFIX = .exe
-endif
-
-#
-# When the processor is NOT 386-based on Windows NT, override the
-# value of $(CPU_TAG).  For WinNT, 95, 16, not CE.
-#
-ifneq ($(CPU_ARCH),x386)
-    CPU_TAG = _$(CPU_ARCH)
-endif
-
-#
-# override ruleset.mk, removing the "lib" prefix for library names, and
-# adding the "32" after the LIBRARY_VERSION.
-#
-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
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
-    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif

mozilla/security/coreconf/WIN32.mk

@@ -38,35 +38,18 @@
 
 DEFAULT_COMPILER = cl
 
-ifdef NS_USE_GCC
-	CC           = gcc
-	CCC          = g++
-	LINK         = ld
-	AR           = ar
-	AR          += cr $@
-	RANLIB       = ranlib
-	BSDECHO      = echo
-	RC           = windres.exe -O coff --use-temp-file
-	LINK_DLL      = $(CC) $(OS_DLLFLAGS) $(DLLFLAGS)
-else
-	CC           = cl
-	CCC          = cl
-	LINK         = link
-	AR           = lib
-	AR          += -NOLOGO -OUT:"$@"
-	RANLIB       = echo
-	BSDECHO      = echo
-	RC           = rc.exe
-endif
+CC           = cl
+CCC          = cl
+LINK         = link
+AR           = lib
+AR          += -NOLOGO -OUT:"$@"
+RANLIB       = echo
+BSDECHO      = echo
 
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
-endif
+NSINSTALL_DIR  = $(MOD_DEPTH)/coreconf/nsinstall
 NSINSTALL      = nsinstall
 
-MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
+MKDEPEND_DIR    = $(MOD_DEPTH)/coreconf/mkdepend
 MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
 # Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute.
 # If it is absolute, gmake will crash unless the named file exists.
@@ -75,50 +58,18 @@ MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk
 INSTALL      = $(NSINSTALL)
 MAKE_OBJDIR  = mkdir
 MAKE_OBJDIR += $(OBJDIR)
+RC           = rc.exe
 GARBAGE     += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
 XP_DEFINE   += -DXP_PC
-ifdef NS_USE_GCC
-LIB_SUFFIX   = a
-else
 LIB_SUFFIX   = lib
-endif
 DLL_SUFFIX   = dll
 
-ifdef NS_USE_GCC
-    OS_CFLAGS += -mno-cygwin -mms-bitfields
-    _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
-    DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
-    ifdef BUILD_OPT
-	OPTIMIZER  += -O2
-	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
-	#
-	# Add symbolic information for a profiler
-	#
-	ifdef MOZ_PROFILE
-		OPTIMIZER += -g
-	endif
-    else
-	OPTIMIZER  += -g
-	NULLSTRING :=
-	SPACE      := $(NULLSTRING) # end of the line
-	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
-	USERNAME   := $(subst -,_,$(USERNAME))
-	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
-    endif
-else # !NS_USE_GCC
-    ifdef BUILD_OPT
+ifdef BUILD_OPT
 	OS_CFLAGS  += -MD
 	OPTIMIZER  += -O2
 	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
 	DLLFLAGS   += -OUT:"$@"
-	#
-	# Add symbolic information for a profiler
-	#
-	ifdef MOZ_PROFILE
-		OPTIMIZER += -Z7
-		DLLFLAGS += -DEBUG -DEBUGTYPE:CV
-	endif
-    else
+else
 	#
 	# Define USE_DEBUG_RTL if you want to use the debug runtime library
 	# (RTL) in the debug build
@@ -130,147 +81,23 @@ else # !NS_USE_GCC
 	endif
 	OPTIMIZER  += -Od -Z7
 	#OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
-	NULLSTRING :=
-	SPACE      := $(NULLSTRING) # end of the line
-	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
-	USERNAME   := $(subst -,_,$(USERNAME))
 	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
 	DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
-	LDFLAGS    += -DEBUG -DEBUGTYPE:CV -PDB:NONE
-    endif
-endif # NS_USE_GCC
+	LDFLAGS    += -DEBUG -DEBUGTYPE:CV
+endif
 
 DEFINES += -DWIN32
-ifdef MAPFILE
-ifndef NS_USE_GCC
-DLLFLAGS += -DEF:$(MAPFILE)
-endif
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
 
 #
 #  The following is NOT needed for the NSPR 2.0 library.
 #
 
 DEFINES += -D_WINDOWS
+ifdef MOZILLA_CLIENT
+INCLUDES += -I$(SOURCE_XP_DIR)/include
+endif
 
 # override default, which is ASFLAGS = CFLAGS
-ifdef NS_USE_GCC
-	AS	= $(CC)
-	ASFLAGS = $(INCLUDES)
-else
-	AS	= ml.exe
-	ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES)
-endif
-
-#
-# override the definitions of RELEASE_TREE found in tree.mk
-#
-ifndef RELEASE_TREE
-    ifdef BUILD_SHIP
-	ifdef USE_SHIPS
-	    RELEASE_TREE = $(NTBUILD_SHIP)
-	else
-	    RELEASE_TREE = //redbuild/components
-	endif
-    else
-	RELEASE_TREE = //redbuild/components
-    endif
-endif
-
-#
-# override the definitions of IMPORT_LIB_PREFIX, LIB_PREFIX, and
-# DLL_PREFIX in prefix.mk
-#
-
-ifndef IMPORT_LIB_PREFIX
-    ifdef NS_USE_GCC
-	IMPORT_LIB_PREFIX = lib
-    else
-	IMPORT_LIB_PREFIX = $(NULL)
-    endif
-endif
-
-ifndef LIB_PREFIX
-    ifdef NS_USE_GCC
-	LIB_PREFIX = lib
-    else
-	LIB_PREFIX = $(NULL)
-    endif
-endif
-
-ifndef DLL_PREFIX
-    DLL_PREFIX =  $(NULL)
-endif
-
-#
-# override the definitions of various _SUFFIX symbols in suffix.mk
-#
-
-#
-# Object suffixes
-#
-ifndef OBJ_SUFFIX
-    ifdef NS_USE_GCC
-	OBJ_SUFFIX = .o
-    else
-	OBJ_SUFFIX = .obj
-    endif
-endif
-
-#
-# Assembler source suffixes
-#
-ifndef ASM_SUFFIX
-    ifdef NS_USE_GCC
-	ASM_SUFFIX = .s
-    else
-	ASM_SUFFIX = .asm
-    endif
-endif
-
-#
-# Library suffixes
-#
-
-ifndef IMPORT_LIB_SUFFIX
-    IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
-endif
-
-ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
-    DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
-endif
-
-#
-# Program suffixes
-#
-ifndef PROG_SUFFIX
-    PROG_SUFFIX = .exe
-endif
-
-#
-# When the processor is NOT 386-based on Windows NT, override the
-# value of $(CPU_TAG).  For WinNT, 95, 16, not CE.
-#
-ifneq ($(CPU_ARCH),x386)
-    CPU_TAG = _$(CPU_ARCH)
-endif
-
-#
-# override ruleset.mk, removing the "lib" prefix for library names, and
-# adding the "32" after the LIBRARY_VERSION.
-#
-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
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
-    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif
+AS	= ml.exe
+ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES)
 

mozilla/security/coreconf/WIN954.0.mk

@@ -35,29 +35,32 @@
 # Config stuff for WIN95
 #
 # This makefile defines the following variables:
-# OS_CFLAGS and OS_DLLFLAGS.
+# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
+# PROCESSOR is an internal variable.
 
-include $(CORE_DEPTH)/coreconf/WIN32.mk
+include $(CORECONF_SOURCE)/WIN32.mk
 
-ifeq ($(CPU_ARCH), x386)
-ifndef NS_USE_GCC
+PROCESSOR := $(shell uname -p)
+ifeq ($(PROCESSOR), I386)
+	CPU_ARCH   = x386
 	OS_CFLAGS += -W3 -nologo
-endif
 	DEFINES += -D_X86_
 else 
-	ifeq ($(CPU_ARCH), MIPS)
+	ifeq ($(PROCESSOR), MIPS)
+		CPU_ARCH    = MIPS
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS  += -W3 -nologo
 	else 
-		ifeq ($(CPU_ARCH), ALPHA)
+		ifeq ($(PROCESSOR), ALPHA)
+			CPU_ARCH  = ALPHA
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
+		else 
+			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
 
-ifndef NS_USE_GCC
 OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
-endif
 DEFINES += -DWIN95

mozilla/security/coreconf/WINCE.mk

@@ -1,207 +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.
-#
-
-#
-# Configuration common to all versions of Windows CE and Pocket PC x.
-#
-
-ifeq ($(CPU_ARCH),x86)
-    DEFAULT_COMPILER = cl
-    CC           = cl
-    CCC          = cl
-else
-ifeq ($(CPU_ARCH),ARM)
-    DEFAULT_COMPILER = clarm
-    CC           = clarm
-    CCC          = clarm
-else
-include CPU_ARCH_is_not_recognized
-include _$(CPU_ARCH)
-endif
-endif
-
-LINK         = link
-AR           = lib
-AR          += -NOLOGO -OUT:"$@"
-RANLIB       = echo
-BSDECHO      = echo
-
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
-endif
-NSINSTALL      = nsinstall
-
-MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
-MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
-# Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute.
-# If it is absolute, gmake will crash unless the named file exists.
-MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk
-
-INSTALL      = $(NSINSTALL)
-MAKE_OBJDIR  = mkdir
-MAKE_OBJDIR += $(OBJDIR)
-RC           = rc.exe
-GARBAGE     += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
-XP_DEFINE   += -DXP_PC
-LIB_SUFFIX   = lib
-DLL_SUFFIX   = dll
-
-ifdef BUILD_OPT
-#   OS_CFLAGS  += -MD
-    OPTIMIZER  += -O2
-    DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
-    DLLFLAGS   += -OUT:"$@"
-else
-    #
-    # Define USE_DEBUG_RTL if you want to use the debug runtime library
-    # (RTL) in the debug build
-    #
-    ifdef USE_DEBUG_RTL
-#	OS_CFLAGS += -MDd
-    else
-#	OS_CFLAGS += -MD
-    endif
-    OPTIMIZER  += -Od -Z7
-    #OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
-    DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
-    DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
-    LDFLAGS    += -DEBUG -DEBUGTYPE:CV
-endif
-
-# DEFINES += -DWIN32
-
-ifdef MAPFILE
-    DLLFLAGS += -DEF:$(MAPFILE)
-endif
-
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-#
-#  The following is NOT needed for the NSPR 2.0 library.
-#
-
-DEFINES += -D_WINDOWS
-
-# override default, which is ASFLAGS = CFLAGS
-AS	= ml.exe
-ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES)
-
-#
-# override the definitions of RELEASE_TREE found in tree.mk
-#
-ifndef RELEASE_TREE
-    ifdef BUILD_SHIP
-	ifdef USE_SHIPS
-	    RELEASE_TREE = $(NTBUILD_SHIP)
-	else
-	    RELEASE_TREE = //redbuild/components
-	endif
-    else
-	RELEASE_TREE = //redbuild/components
-    endif
-endif
-
-#
-# override the definitions of LIB_PREFIX and DLL_PREFIX in prefix.mk
-#
-
-ifndef LIB_PREFIX
-    LIB_PREFIX =  $(NULL)
-endif
-
-ifndef DLL_PREFIX
-    DLL_PREFIX =  $(NULL)
-endif
-
-#
-# override the definitions of various _SUFFIX symbols in suffix.mk
-#
-
-#
-# Object suffixes
-#
-ifndef OBJ_SUFFIX
-    OBJ_SUFFIX = .obj
-endif
-
-#
-# Assembler source suffixes
-#
-ifndef ASM_SUFFIX
-    ASM_SUFFIX = .asm
-endif
-
-#
-# Library suffixes
-#
-
-ifndef IMPORT_LIB_SUFFIX
-    IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
-endif
-
-ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
-    DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
-endif
-
-#
-# Program suffixes
-#
-ifndef PROG_SUFFIX
-    PROG_SUFFIX = .exe
-endif
-
-#
-# override ruleset.mk, removing the "lib" prefix for library names, and
-# adding the "32" after the LIBRARY_VERSION.
-#
-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
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
-    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif
-
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)
-

mozilla/security/coreconf/WINCE3.0.mk

@@ -1,99 +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 WINCE 3.0 (MS Pocket PC 2002)
-#
-# CPU_ARCH must already be defined to one of:
-#   x86, ARM
-#
-# This makefile defines the following variables:
-# OS_CFLAGS, and OS_DLLFLAGS.
-
-include $(CORE_DEPTH)/coreconf/WINCE.mk
-
-CEVersion  = 300
-CePlatform = WIN32_PLATFORM_PSPC=310
-
-ifeq ($(CPU_ARCH), x86)
-    DEFINES += -D_X86_ -D_i386_ -Di_386_ -Dx86
-    OS_CFLAGS += -Gs8192 -GF
-    OS_DLLFLAGS += -machine:IX86
-else 
-ifeq ($(CPU_ARCH), ARM)
-    DEFINES += -DARM -D_ARM_
-    OS_DLLFLAGS += -machine:ARM
-else 
-    include CPU_ARCH_is_undefined
-endif
-endif
-
-DEFINES += -D_WIN32_WCE=300 -DUNDER_CE=300
-DEFINES += -DWIN32_PLATFORM_PSPC=310
-DEFINES += -DUNICODE -D_UNICODE
-OS_CFLAGS += -W3 -nologo
-
-OS_DLLFLAGS += -DLL 
-
-LINKFLAGS = -nologo -PDB:NONE -subsystem:windowsce,3.00 \
- -nodefaultlib:libc.lib \
- -nodefaultlib:libcd.lib \
- -nodefaultlib:libcmt.lib \
- -nodefaultlib:libcmtd.lib \
- -nodefaultlib:msvcrt.lib \
- -nodefaultlib:msvcrtd.lib \
- -nodefaultlib:oldnames.lib \
- $(NULL)
-
-LINK    += $(LINKFLAGS)
-LDFLAGS += $(LINKFLAGS)
-
-OS_LIBS= coredll.lib corelibc.lib
-
-#DLLBASE = -base:"0x00100000" -stack:0x10000,0x1000 -entry:"_DllMainCRTStartup"
-DLLBASE += -align:"4096"
-
-#SUB_SHLOBJS =
-#EXTRA_LIBS =
-#EXTRA_SHARED_LIBS =
-#OS_LIBS=
-#LD_LIBS=
-
-#
-# Win NT needs -GT so that fibers can work
-#
-#OS_CFLAGS += -GT
-#DEFINES += -DWINNT
-
-# WINNT uses the lib prefix, Win95 and WinCE don't
-#NSPR31_LIB_PREFIX = lib

mozilla/security/coreconf/WINNT3.51.mk

@@ -35,20 +35,26 @@
 # Config stuff for WINNT 3.51
 #
 # This makefile defines the following variables:
-# OS_CFLAGS and OS_DLLFLAGS.
+# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
 # It has the following internal variables:
 # OS_PROC_CFLAGS and OS_WIN_CFLAGS.
 
-include $(CORE_DEPTH)/coreconf/WIN32.mk
+include $(CORECONF_SOURCE)/WIN32.mk
 
-ifeq ($(CPU_ARCH), x386)
+PROCESSOR := $(shell uname -p)
+ifeq ($(PROCESSOR), I386)
+	CPU_ARCH        = x386
 	OS_PROC_CFLAGS += -D_X86_
 else 
-	ifeq ($(CPU_ARCH), MIPS)
+	ifeq ($(PROCESSOR), MIPS)
+		CPU_ARCH        = MIPS
 		OS_PROC_CFLAGS += -D_MIPS_
 	else 
-		ifeq ($(CPU_ARCH), ALPHA)
+		ifeq ($(PROCESSOR), ALPHA)
+			CPU_ARCH        = ALPHA
 			OS_PROC_CFLAGS += -D_ALPHA_
+		else 
+			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif

mozilla/security/coreconf/WINNT4.0.mk

@@ -35,22 +35,29 @@
 # Config stuff for WINNT 4.0
 #
 # This makefile defines the following variables:
-# OS_CFLAGS and OS_DLLFLAGS.
+# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
+# PROCESSOR is an internal variable.
 
-include $(CORE_DEPTH)/coreconf/WIN32.mk
+include $(CORECONF_SOURCE)/WIN32.mk
 
-ifeq ($(CPU_ARCH), x386)
+PROCESSOR := $(shell uname -p)
+ifeq ($(PROCESSOR), I386)
+	CPU_ARCH   = x386
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(CPU_ARCH), MIPS)
+	ifeq ($(PROCESSOR), MIPS)
+		CPU_ARCH  = MIPS
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS += -W3 -nologo
 	else 
-		ifeq ($(CPU_ARCH), ALPHA)
+		ifeq ($(PROCESSOR), ALPHA)
+			CPU_ARCH  = ALPHA
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
+		else 
+			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif

mozilla/security/coreconf/WINNT5.0.mk

@@ -35,22 +35,29 @@
 # Config stuff for WINNT 5.0 (Windows 2000)
 #
 # This makefile defines the following variables:
-# OS_CFLAGS and OS_DLLFLAGS.
+# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
+# PROCESSOR is an internal variable.
 
-include $(CORE_DEPTH)/coreconf/WIN32.mk
+include $(CORECONF_SOURCE)/WIN32.mk
 
-ifeq ($(CPU_ARCH), x386)
+PROCESSOR := $(shell uname -p)
+ifeq ($(PROCESSOR), I386)
+	CPU_ARCH   = x386
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(CPU_ARCH), MIPS)
+	ifeq ($(PROCESSOR), MIPS)
+		CPU_ARCH  = MIPS
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS += -W3 -nologo
 	else 
-		ifeq ($(CPU_ARCH), ALPHA)
+		ifeq ($(PROCESSOR), ALPHA)
+			CPU_ARCH  = ALPHA
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
+		else 
+			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif

mozilla/security/coreconf/WINNT5.1.mk

@@ -1,65 +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 WINNT 5.1 (Windows XP)
-#
-# This makefile defines the following variables:
-# OS_CFLAGS and OS_DLLFLAGS.
-
-include $(CORE_DEPTH)/coreconf/WIN32.mk
-
-ifeq ($(CPU_ARCH), x386)
-	OS_CFLAGS += -W3 -nologo
-	DEFINES += -D_X86_
-else 
-	ifeq ($(CPU_ARCH), MIPS)
-		#OS_CFLAGS += -W3 -nologo
-		#DEFINES += -D_MIPS_
-		OS_CFLAGS += -W3 -nologo
-	else 
-		ifeq ($(CPU_ARCH), ALPHA)
-			OS_CFLAGS += -W3 -nologo
-			DEFINES += -D_ALPHA_=1
-		endif
-	endif
-endif
-
-OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
-#
-# Win NT needs -GT so that fibers can work
-#
-OS_CFLAGS += -GT
-DEFINES += -DWINNT
-
-NSPR31_LIB_PREFIX = lib

mozilla/security/coreconf/arch.mk

@@ -33,16 +33,6 @@
 
 #######################################################################
 # Master "Core Components" macros for getting the OS architecture     #
-# defines these symbols:
-# 64BIT_TAG
-# OS_ARCH	(from uname -r)
-# OS_TEST	(from uname -m)
-# OS_RELEASE	(from uname -v and/or -r)
-# OS_TARGET	User defined, or set to OS_ARCH
-# CPU_ARCH  	(from unmame -m or -p, ONLY on WINNT)
-# OS_CONFIG	OS_TARGET + OS_RELEASE
-# OBJDIR_TAG
-# OBJDIR_NAME
 #######################################################################
 
 #
@@ -63,9 +53,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
 
 OS_TEST := $(shell uname -m)
 ifeq ($(OS_TEST),i86pc)
-    OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+	OS_RELEASE := $(shell uname -r)_$(OS_TEST)
 else
-    OS_RELEASE := $(shell uname -r)
+	OS_RELEASE := $(shell uname -r)
 endif
 
 #
@@ -73,7 +63,7 @@ endif
 #
 
 ifeq ($(OS_ARCH),IRIX64)
-    OS_ARCH = IRIX
+	OS_ARCH = IRIX
 endif
 
 #
@@ -81,7 +71,7 @@ endif
 #
 
 ifeq ($(OS_ARCH),BSD_386)
-    OS_ARCH = BSD_OS
+	OS_ARCH = BSD_OS
 endif
 
 #
@@ -89,23 +79,23 @@ endif
 #
 
 ifeq ($(OS_ARCH),UNIX_SV)
-    ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),)
-	OS_ARCH = NCR
-    else
-	# Make UnixWare something human readable
-	OS_ARCH = UNIXWARE
-    endif
+	ifneq ($(findstring NCR, $(shell grep NCR /etc/bcheckrc | head -1 )),)
+		OS_ARCH = NCR
+	else
+		# Make UnixWare something human readable
+		OS_ARCH = UNIXWARE
+	endif
 
-    # Get the OS release number, not 4.2
-    OS_RELEASE := $(shell uname -v)
+	# Get the OS release number, not 4.2
+	OS_RELEASE := $(shell uname -v)
 endif
 
 ifeq ($(OS_ARCH),UNIX_System_V)
-    OS_ARCH	= NEC
+	OS_ARCH	= NEC
 endif
 
 ifeq ($(OS_ARCH),AIX)
-    OS_RELEASE := $(shell uname -v).$(shell uname -r)
+	OS_RELEASE := $(shell uname -v).$(shell uname -r)
 endif
 
 #
@@ -113,13 +103,13 @@ endif
 #
 
 ifeq ($(OS_ARCH)$(OS_RELEASE),OSF1V4.0)
-    OS_VERSION := $(shell uname -v)
-    ifeq ($(OS_VERSION),564)
-	OS_RELEASE := V4.0B
-    endif
-    ifeq ($(OS_VERSION),878)
-	OS_RELEASE := V4.0D
-    endif
+	OS_VERSION := $(shell uname -v)
+	ifeq ($(OS_VERSION),564)
+		OS_RELEASE := V4.0B
+	endif
+	ifeq ($(OS_VERSION),878)
+		OS_RELEASE := V4.0D
+	endif
 endif
 
 #
@@ -127,42 +117,38 @@ endif
 #
 
 ifeq ($(OS_ARCH),ReliantUNIX-N)
-    OS_ARCH    = ReliantUNIX
-    OS_RELEASE = 5.4
+	OS_ARCH    = ReliantUNIX
+	OS_RELEASE = 5.4
 endif
 
 ifeq ($(OS_ARCH),SINIX-N)
-    OS_ARCH    = ReliantUNIX
-    OS_RELEASE = 5.4
+	OS_ARCH    = ReliantUNIX
+	OS_RELEASE = 5.4
 endif
 
 #
-# Handle FreeBSD 2.2-STABLE, Linux 2.0.30-osfmach3, and
-# IRIX 6.5-ALPHA-1289139620.
+# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
 #
 
-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
-    OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
+ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
+OS_RELEASE	:= $(shell echo $(OS_RELEASE) | sed 's/-.*//')
 endif
 
 ifeq ($(OS_ARCH),Linux)
-    OS_RELEASE := $(subst ., ,$(OS_RELEASE))
-    ifneq ($(words $(OS_RELEASE)),1)
-	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
-    endif
+	OS_RELEASE := $(basename $(OS_RELEASE))
 endif
 
 #
 # For OS/2
 #
 ifeq ($(OS_ARCH),OS_2)
-    OS_ARCH = OS2
-    OS_RELEASE := $(shell uname -v)
+	OS_ARCH = OS2
+	OS_RELEASE := $(shell uname -v)
 endif
 
 ifneq (,$(findstring OpenVMS,$(OS_ARCH)))
-    OS_ARCH = OpenVMS
-    OS_RELEASE := $(shell uname -v)
+	OS_ARCH = OpenVMS
+	OS_RELEASE := $(shell uname -v)
 endif
 
 #######################################################################
@@ -188,37 +174,30 @@ endif
 #
 # The following hack allows one to build on a WIN95 machine (as if
 # s/he were cross-compiling on a WINNT host for a WIN95 target).
-# It also accomodates for MKS's and Cygwin's uname.exe.
+# It also accomodates for MKS's uname.exe.  If you never intend
+# to do development on a WIN95 machine, you don't need this. It doesn't
+# work any more anyway.
 #
 ifeq ($(OS_ARCH),WIN95)
-    OS_ARCH   = WINNT
-    OS_TARGET = WIN95
+	OS_ARCH   = WINNT
+	OS_TARGET = WIN95
 endif
 ifeq ($(OS_ARCH),Windows_95)
-    OS_ARCH   = Windows_NT
-    OS_TARGET = WIN95
-endif
-ifeq ($(OS_ARCH),CYGWIN_95-4.0)
-	OS_ARCH   = CYGWIN_NT-4.0
-	OS_TARGET = WIN95
-endif
-ifeq ($(OS_ARCH),CYGWIN_98-4.10)
-	OS_ARCH   = CYGWIN_NT-4.0
+	OS_ARCH   = Windows_NT
 	OS_TARGET = WIN95
 endif
 
 #
-# On WIN32, we also define the variable CPU_ARCH, if it isn't already.
+# On WIN32, we also define the variable CPU_ARCH.
 #
-ifndef CPU_ARCH
-    ifeq ($(OS_ARCH), WINNT)
+
+ifeq ($(OS_ARCH), WINNT)
 	CPU_ARCH := $(shell uname -p)
 	ifeq ($(CPU_ARCH),I386)
-	    CPU_ARCH = x386
+		CPU_ARCH = x386
 	endif
-    endif
-endif
-
+else
+#
 # If uname -s returns "Windows_NT", we assume that we are using
 # the uname.exe in MKS toolkit.
 #
@@ -227,54 +206,33 @@ endif
 # Moreover, it doesn't have the -p option, so we need to use uname -m.
 #
 ifeq ($(OS_ARCH), Windows_NT)
-    OS_ARCH = WINNT
-    OS_MINOR_RELEASE := $(shell uname -v)
-    # strip leading 0
-    OS_MINOR_RELEASE := $(patsubst 0%,%,$(OS_MINOR_RELEASE))
-    OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE)
-    ifndef CPU_ARCH
+	OS_ARCH = WINNT
+	OS_MINOR_RELEASE := $(shell uname -v)
+	ifeq ($(OS_MINOR_RELEASE),00)
+		OS_MINOR_RELEASE = 0
+	endif
+	OS_RELEASE = $(OS_RELEASE).$(OS_MINOR_RELEASE)
 	CPU_ARCH := $(shell uname -m)
 	#
 	# MKS's uname -m returns "586" on a Pentium machine.
 	#
 	ifneq (,$(findstring 86,$(CPU_ARCH)))
-	    CPU_ARCH = x386
+		CPU_ARCH = x386
 	endif
-    endif
 endif
-#
-# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using
-# the uname.exe in the Cygwin tools.
-#
-ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH)))
-    OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH))
-    OS_ARCH = WINNT
-    ifndef CPU_ARCH
-	CPU_ARCH := $(shell uname -m)
-	#
-	# Cygwin's uname -m returns "i686" on a Pentium Pro machine.
-	#
-	ifneq (,$(findstring 86,$(CPU_ARCH)))
-	    CPU_ARCH = x386
-	endif
-    endif
 endif
 
 ifndef OS_TARGET
-    OS_TARGET = $(OS_ARCH)
+	OS_TARGET = $(OS_ARCH)
 endif
 
 ifeq ($(OS_TARGET), WIN95)
-    OS_RELEASE = 4.0
+	OS_RELEASE = 4.0
 endif
 
 ifeq ($(OS_TARGET), WIN16)
-    OS_RELEASE =
-#   OS_RELEASE = _3.11
-endif
-
-ifdef OS_TARGET_RELEASE
-    OS_RELEASE = $(OS_TARGET_RELEASE)
+	OS_RELEASE =
+#	OS_RELEASE = _3.11
 endif
 
 #
@@ -289,25 +247,25 @@ OS_CONFIG = $(OS_TARGET)$(OS_RELEASE)
 #
 
 ifdef BUILD_OPT
-    ifeq ($(OS_TARGET),WIN16)
-	OBJDIR_TAG = _O
-    else
-	OBJDIR_TAG = $(64BIT_TAG)_OPT
-    endif
+	ifeq ($(OS_TARGET),WIN16)
+		OBJDIR_TAG = _O
+	else
+		OBJDIR_TAG = $(64BIT_TAG)_OPT
+	endif
 else
-    ifdef BUILD_IDG
-	ifeq ($(OS_TARGET),WIN16)
-	    OBJDIR_TAG = _I
+	ifdef BUILD_IDG
+		ifeq ($(OS_TARGET),WIN16)
+			OBJDIR_TAG = _I
+		else
+			OBJDIR_TAG = $(64BIT_TAG)_IDG
+		endif
 	else
-	    OBJDIR_TAG = $(64BIT_TAG)_IDG
+		ifeq ($(OS_TARGET),WIN16)
+			OBJDIR_TAG = _D
+		else
+			OBJDIR_TAG = $(64BIT_TAG)_DBG
+		endif
 	endif
-    else
-	ifeq ($(OS_TARGET),WIN16)
-	    OBJDIR_TAG = _D
-	else
-	    OBJDIR_TAG = $(64BIT_TAG)_DBG
-	endif
-    endif
 endif
 
 #
@@ -319,18 +277,29 @@ endif
 # IMPL_STRATEGY may be defined too.
 #
 
-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+# Name of the binary code directories
+ifeq ($(OS_ARCH), WINNT)
+	ifeq ($(CPU_ARCH),x386)
+		OBJDIR_NAME = $(OS_CONFIG)$(OBJDIR_TAG).OBJ
+	else
+		OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH)$(OBJDIR_TAG).OBJ
+	endif
+else
+endif
 
-ifeq (,$(filter-out WINNT WIN95 WINCE,$(OS_TARGET))) # list omits WIN16
+OBJDIR_NAME = $(OS_CONFIG)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+
+ifeq ($(OS_ARCH), WINNT)
+ifneq ($(OS_TARGET),WIN16)
 ifndef BUILD_OPT
 #
 # Define USE_DEBUG_RTL if you want to use the debug runtime library
 # (RTL) in the debug build
 #
 ifdef USE_DEBUG_RTL
-    OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD
+	OBJDIR_NAME = $(OS_CONFIG)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD
+endif
 endif
 endif
 endif
 
-MK_ARCH = included

mozilla/security/coreconf/autoconf.mk.in

@@ -0,0 +1,72 @@
+USE_AUTOCONF	= 1
+NO_MDUPDATE	= 1
+OBJDIR_NAME	= .
+OBJDIR		= .
+
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+bindir		= @bindir@
+includedir	= @includedir@
+libdir		= @libdir@
+datadir		= @datadir@
+
+dist_prefix	= @dist_prefix@
+dist_bindir	= @dist_bindir@
+dist_includedir = @dist_includedir@
+dist_libdir	= @dist_libdir@
+
+DIST		= $(dist_prefix)
+
+CORECONF_SOURCE	= @CORECONF_SOURCE@
+
+MOZILLA_CLIENT  = @MOZILLA_CLIENT@
+ENABLE_CMD	= @ENABLE_CMD@
+
+GNU_CC		= @GNU_CC@
+GNU_CXX		= @GNU_CXX@
+CC		= @CC@
+CCC		= @CXX@
+OS_CFLAGS	= @CFLAGS@ @DSO_CFLAGS@
+CXXFLAGS	= @CXXFLAGS@ @DSO_CFLAGS@
+HOST_CC		= @HOST_CC@
+HOST_CFLAGS	= @HOST_CFLAGS@
+LDFLAGS		= @LDFLAGS@
+
+COMPILER_DEPEND	= @COMPILER_DEPEND@
+MDDEPDIR	:= @MDDEPDIR@
+
+USE_PTHREADS	= @USE_PTHREADS@
+
+LIB_SUFFIX	= @LIB_SUFFIX@
+DLL_SUFFIX	= @DLL_SUFFIX@
+MKSHLIB		= @MKSHLIB@
+DSO_CFLAGS	= @DSO_CFLAGS@
+DSO_LDOPTS	= @DSO_LDOPTS@
+
+CPU_ARCH	= @CPU_ARCH@
+
+OS_TARGET	= @OS_TARGET@
+OS_ARCH		= @OS_ARCH@
+OS_RELEASE	= @OS_RELEASE@
+OS_TEST		= @OS_TEST@
+
+DEFINES		= @DEFINES@ @DEFS@
+AR		= @AR@
+AR_FLAGS	= @AR_FLAGS@
+AS		= @AS@
+ASFLAGS		= @ASFLAGS@
+LD		= @LD@
+RANLIB		= @RANLIB@
+PERL		= @PERL@
+XARGS		= @XARGS@
+
+OS_LIBS		= @OS_LIBS@
+
+RC		= @RC@
+DLLFLAGS	= @DLLFLAGS@
+
+NSPR_CFLAGS	= @NSPR_CFLAGS@
+NSPR_LIBS	= @NSPR_LIBS@
+
+DBM_CFLAGS	= @DBM_CFLAGS@
+DBM_LIBS	= @DBM_LIBS@

mozilla/security/coreconf/command.mk

@@ -36,20 +36,36 @@
 # can be overridden in <arch>.mk                                      #
 #######################################################################
 
-AS            = $(CC)
-ASFLAGS      += $(CFLAGS)
 CCF           = $(CC) $(CFLAGS)
+LINK          = $(LD)
 LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
 LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
 NFSPWD        = $(NSINSTALL_DIR)/nfspwd
-CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 		$(XCFLAGS)
-RANLIB        = echo
+CXXFLAGS       += $(DEFINES) $(INCLUDES) $(XCFLAGS)
 TAR           = /bin/tar
+
+NSINSTALL = $(NSINSTALL_DIR)/nsinstall
+ifeq ($(NSDISTMODE),copy)
+        # copy files, but preserve source mtime
+        INSTALL  = $(NSINSTALL)
+        INSTALL += -t
+else
+        ifeq ($(NSDISTMODE),absolute_symlink)
+                # install using absolute symbolic links
+                INSTALL  = $(NSINSTALL)
+                INSTALL += -L `$(NFSPWD)`
+        else
+                # install using relative symbolic links
+                INSTALL  = $(NSINSTALL)
+                INSTALL += -R
+        endif
+endif
+
 #
 # For purify
 #
-NOMD_CFLAGS  += $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(XP_DEFINE) $(DEFINES) \
-		$(INCLUDES) $(XCFLAGS)
+NOMD_CFLAGS  += $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+		$(XCFLAGS)
 
-MK_COMMAND = included