| author | Brian Smith <bsmith@mozilla.com> |
| Thu, 11 Apr 2013 16:46:53 -0700 | |
| changeset 128523 | 0857f2bc8f8a646e96b93a76307451c65238f35a |
| parent 128522 | 3135a6091d4cf5e64dcb073aab1273622c42bcc5 |
| child 128524 | c4bac10ee49e73a8c60dfaf817eab1e751f2f1d5 |
| push id | 26363 |
| push user | bsmith@mozilla.com |
| push date | Fri, 12 Apr 2013 00:03:26 +0000 |
| treeherder | mozilla-inbound@0857f2bc8f8a [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | bsmith |
| bugs | 858231 |
| milestone | 23.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/configure.in +++ b/configure.in @@ -3959,17 +3959,17 @@ dnl = If NSS was not detected in the sys dnl = use the one in the source tree (mozilla/security/nss) dnl ======================================================== MOZ_ARG_WITH_BOOL(system-nss, [ --with-system-nss Use system installed NSS], _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.14.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.5, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_NATIVE_NSS"; then NSS_LIBS="$NSS_LIBS -lcrmf" else NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss' if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2"; then
deleted file mode 100644 --- a/dbm/include/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dbm - -EXPORTS = \ - nsres.h \ - cdefs.h \ - mcom_db.h \ - ncompat.h \ - winfile.h \ - $(NULL) - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - -PRIVATE_EXPORTS = \ - hsearch.h \ - page.h \ - extern.h \ - ndbm.h \ - queue.h \ - hash.h \ - mpool.h \ - search.h \ - $(NULL) - -PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS)) - -include $(topsrcdir)/config/rules.mk -
deleted file mode 100644 --- a/dbm/include/Makefile.win +++ /dev/null @@ -1,45 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - -#//------------------------------------------------------------------------ -#// -#// Makefile to build the cert library -#// -#//------------------------------------------------------------------------ - -!if "$(MOZ_BITS)" == "16" -!ifndef MOZ_DEBUG -OPTIMIZER=-Os -UDEBUG -DNDEBUG -!endif -!endif - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH= ..\.. - -!ifndef MAKE_OBJ_TYPE -MAKE_OBJ_TYPE=EXE -!endif - -#//------------------------------------------------------------------------ -#// -#// install headers -#// -#//------------------------------------------------------------------------ -EXPORTS=nsres.h cdefs.h mcom_db.h ncompat.h winfile.h - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include <$(DEPTH)/config/rules.mak> - -CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT -
deleted file mode 100644 --- a/dbm/include/hsearch.h +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Margo Seltzer. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. ***REMOVED*** - see - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)search.h 8.1 (Berkeley) 6/4/93 - */ - -/* Backward compatibility to hsearch interface. */ -typedef struct entry { - char *key; - char *data; -} ENTRY; - -typedef enum { - FIND, ENTER -} ACTION; - -int hcreate (unsigned int); -void hdestroy (void); -ENTRY *hsearch (ENTRY, ACTION);
deleted file mode 100644 --- a/dbm/src/Makefile.in +++ /dev/null @@ -1,59 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBRARY_NAME = mozdbm_s -LIB_IS_C_ONLY = 1 - -ifeq ($(OS_ARCH),WINNT) -LIBRARY_NAME = dbm$(MOZ_BITS) -endif - -CSRCS = \ - db.c \ - h_bigkey.c \ - h_func.c \ - h_log2.c \ - h_page.c \ - hash.c \ - hash_buf.c \ - hsearch.c \ - mktemp.c \ - ndbm.c \ - strerror.c \ - nsres.c \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -CSRCS += memmove.c snprintf.c -else -ifeq (,$(filter -DHAVE_MEMMOVE=1,$(ACDEFINES))) -CSRCS += memmove.c -endif - -ifeq (,$(filter -DHAVE_SNPRINTF=1,$(ACDEFINES))) -CSRCS += snprintf.c -endif -endif # WINNT - -LOCAL_INCLUDES = -I$(srcdir)/../include - -FORCE_STATIC_LIB = 1 -FORCE_USE_PIC = 1 - -include $(topsrcdir)/config/rules.mk - -DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) - -ifeq ($(OS_ARCH),AIX) -OS_LIBS += -lc_r -endif -
deleted file mode 100644 --- a/dbm/src/Makefile.win +++ /dev/null @@ -1,81 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - - -#//------------------------------------------------------------------------ -#// -#// Makefile to build the cert library -#// -#//------------------------------------------------------------------------ - -!if "$(MOZ_BITS)" == "16" -!ifndef MOZ_DEBUG -OPTIMIZER=-Os -UDEBUG -DNDEBUG -!endif -!endif - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH= ..\.. - -!ifndef MAKE_OBJ_TYPE -MAKE_OBJ_TYPE=EXE -!endif - -#//------------------------------------------------------------------------ -#// -#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) -#// -#//------------------------------------------------------------------------ -LIBNAME=dbm$(MOZ_BITS) -PDBFILE=$(LIBNAME).pdb - -#//------------------------------------------------------------------------ -#// -#// Define the files necessary to build the target (ie. OBJS) -#// -#//------------------------------------------------------------------------ -OBJS= \ - .\$(OBJDIR)\db.obj \ - .\$(OBJDIR)\h_bigkey.obj \ - .\$(OBJDIR)\h_func.obj \ - .\$(OBJDIR)\h_log2.obj \ - .\$(OBJDIR)\h_page.obj \ - .\$(OBJDIR)\hash.obj \ - .\$(OBJDIR)\hash_buf.obj \ - .\$(OBJDIR)\hsearch.obj \ - .\$(OBJDIR)\memmove.obj \ - .\$(OBJDIR)\mktemp.obj \ - .\$(OBJDIR)\ndbm.obj \ - .\$(OBJDIR)\snprintf.obj \ - .\$(OBJDIR)\strerror.obj \ - .\$(OBJDIR)\nsres.obj \ - $(NULL) - -#//------------------------------------------------------------------------ -#// -#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...) -#// (these must be defined before the common makefiles are included) -#// -#//------------------------------------------------------------------------ -LIBRARY = .\$(OBJDIR)\$(LIBNAME).lib -LINCS = -I..\include - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include <$(DEPTH)/config/rules.mak> - -CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT -D__DBINTERFACE_PRIVATE - -install:: $(LIBRARY) - $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - -
deleted file mode 100644 --- a/dbm/tests/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -lots -test.db
deleted file mode 100644 --- a/dbm/tests/Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = dbm - -PACKAGE_FILE = dbmtest.pkg - -PROGRAM = lots$(BIN_SUFFIX) - -CSRCS = lots.c - -ifeq ($(OS_ARCH),WINNT) -EXTRA_DSO_LIBS = dbm$(MOZ_BITS) -else -EXTRA_DSO_LIBS = mozdbm_s -endif - -LIBS = $(EXTRA_DSO_LIBS) - -include $(topsrcdir)/config/rules.mk -
--- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -293,21 +293,22 @@ export:: cp -Rp $(topsrcdir)/security/dbm $(NSS_SRCDIR)/security cp -Rp $(topsrcdir)/dbm $(NSS_SRCDIR) (cd $(NSS_SRCDIR) && patch -p1 < $(call core_abspath,$(MOZ_NSS_PATCH))) else NSS_SRCDIR = $(topsrcdir) endif NSS_DIRS = -ifndef NSS_DISABLE_DBM -NSS_DIRS += dbm -endif ifndef MOZ_FOLD_LIBS NSS_DIRS += nss/lib +else +ifndef NSS_DISABLE_DBM +NSS_DIRS += nss/lib/dbm +endif endif NSS_DIRS += \ nss/cmd/lib \ nss/cmd/shlibsign \ $(NULL) ifdef ENABLE_TESTS NSS_DIRS += \ @@ -435,17 +436,17 @@ else ln -sf $< $@ endif # Interdependencies between nss sub-directories, and dependencies on NSPR/SQLite libs-nss/lib/ckfw: libs-nss/lib/nss/../base $(NSPR_IMPORT_LIBS) libs-nss/lib/softoken: $(NSPR_IMPORT_LIBS) $(SQLITE_IMPORT_LIB) libs-nss/lib/softoken: libs-nss/lib/freebl ifndef NSS_DISABLE_DBM -libs-nss/lib/softoken: libs-dbm +libs-nss/lib/softoken: libs-nss/lib/dbm endif libs-nss/lib/softoken: $(DIST)/lib/$(IMPORT_PREFIX)nssutil3$(IMPORT_SUFFIX) libs-nss/lib/freebl: $(DIST)/lib/$(IMPORT_PREFIX)nssutil3$(IMPORT_SUFFIX) $(NSPR_IMPORT_LIBS) # For each directory where we build static libraries, force the NSS build system # to only build static libraries. $(addprefix libs-,$(NSS_STATIC_DIRS)): DEFAULT_GMAKE_FLAGS += SHARED_LIBRARY= IMPORT_LIBRARY= endif # MOZ_FOLD_LIBS @@ -484,15 +485,11 @@ libs-nss/cmd/modutil: libs-nss/lib/jar ifeq (WINNT,$(OS_TARGET)) libs-nss/cmd/modutil: libs-nss/lib/zlib endif $(NSS_CMD_TARGETS): libs-nss/cmd/lib else $(NSS_CMD_TARGETS): libs-nss/lib libs-nss/cmd/lib endif # MOZ_FOLD_LIBS -ifndef NSS_DISABLE_DBM -libs-nss/lib: libs-dbm -endif - # Work around NSS build system race condition creating certdata.c in # security/nss/lib/ckfw/builtins. See bug #836220. libs-nss/lib: $(call mkdir_deps,../nss/lib/ckfw/builtins)
deleted file mode 100644 --- a/security/coreconf/OSF1V2.0.mk +++ /dev/null @@ -1,5 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -include $(CORE_DEPTH)/coreconf/OSF1.mk
deleted file mode 100644 --- a/security/coreconf/SunOS5.10.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(OS_RELEASE),5.10) - OS_DEFINES += -DSOLARIS2_10 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100755 --- a/security/coreconf/SunOS5.10_i86pc.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(USE_64),1) - CPU_ARCH = x86_64 -else - CPU_ARCH = x86 - OS_DEFINES += -Di386 -endif - -ifeq ($(OS_RELEASE),5.10_i86pc) - OS_DEFINES += -DSOLARIS2_10 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100644 --- a/security/coreconf/SunOS5.11.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(OS_RELEASE),5.11) - OS_DEFINES += -DSOLARIS2_11 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100644 --- a/security/coreconf/SunOS5.11_i86pc.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(USE_64),1) - CPU_ARCH = x86_64 -else - CPU_ARCH = x86 - OS_DEFINES += -Di386 -endif - -ifeq ($(OS_RELEASE),5.11_i86pc) - OS_DEFINES += -DSOLARIS2_11 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100644 --- a/security/coreconf/SunOS5.8.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(OS_RELEASE),5.8) - OS_DEFINES += -DSOLARIS2_8 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100644 --- a/security/coreconf/SunOS5.8_i86pc.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -CPU_ARCH = x86 -ARCHFLAG = -OS_DEFINES += -Di386 - -ifeq ($(OS_RELEASE),5.8_i86pc) - OS_DEFINES += -DSOLARIS2_8 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100755 --- a/security/coreconf/SunOS5.9.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -ifeq ($(OS_RELEASE),5.9) - OS_DEFINES += -DSOLARIS2_9 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100755 --- a/security/coreconf/SunOS5.9_i86pc.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/SunOS5.mk - -CPU_ARCH = x86 -ARCHFLAG = -OS_DEFINES += -Di386 - -ifeq ($(OS_RELEASE),5.9_i86pc) - OS_DEFINES += -DSOLARIS2_9 -endif - -OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
deleted file mode 100644 --- a/security/coreconf/SunOS5.mk +++ /dev/null @@ -1,137 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/UNIX.mk - -# Sun's WorkShop defines v8, v8plus and v9 architectures. -# gcc on Solaris defines v8 and v9 "cpus". -# gcc's v9 is equivalent to Workshop's v8plus. -# gcc's -m64 is equivalent to Workshop's v9 - -ifeq ($(USE_64), 1) - ifdef NS_USE_GCC - ARCHFLAG=-m64 - else - ifeq ($(OS_TEST),i86pc) - ARCHFLAG=-xarch=amd64 - else - ARCHFLAG=-xarch=v9 - endif - endif -else - ifneq ($(OS_TEST),i86pc) - ifdef NS_USE_GCC - ARCHFLAG=-mcpu=v8 - else - ARCHFLAG=-xarch=v8 - endif - endif -endif - -DEFAULT_COMPILER = cc - -ifdef NS_USE_GCC - CC = gcc - OS_CFLAGS += -Wall -Wno-format -Werror-implicit-function-declaration -Wno-switch - CCC = g++ - CCC += -Wall -Wno-format - ASFLAGS += -x assembler-with-cpp - OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) - ifdef USE_MDUPDATE - OS_CFLAGS += -MDupdate $(DEPENDENCIES) - endif - ifdef BUILD_OPT - OPTIMIZER = -O2 - # Enable this for accurate dtrace profiling - # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer - endif -else - CC = cc - CCC = CC - ASFLAGS += -Wa,-P - OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) - ifndef BUILD_OPT - OS_CFLAGS += -xs - else - OPTIMIZER = -xO4 - endif - ifdef USE_TCOV - CC += -xprofile=tcov - CCC += -xprofile=tcov - endif -endif - -RANLIB = echo -CPU_ARCH = sparc -OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT - -# Purify doesn't like -MDupdate -NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) - -MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) -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 ';-' $< | \ - sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ - - - - -# ld options: -# -G: produce a shared object -# -z defs: no unresolved symbols allowed -ifdef NS_USE_GCC -ifeq ($(USE_64), 1) - DSO_LDOPTS += -m64 -endif - DSO_LDOPTS += -shared -h $(notdir $@) -else -ifeq ($(USE_64), 1) - ifeq ($(OS_TEST),i86pc) - DSO_LDOPTS +=-xarch=amd64 - else - DSO_LDOPTS +=-xarch=v9 - endif -endif - DSO_LDOPTS += -G -h $(notdir $@) -endif -DSO_LDOPTS += -z combreloc -z defs -z ignore - -# -KPIC generates position independent code for use in shared libraries. -# (Similarly for -fPIC in case of gcc.) -ifdef NS_USE_GCC - DSO_CFLAGS += -fPIC -else - DSO_CFLAGS += -KPIC -endif - -NOSUCHFILE = /solaris-rm-f-sucks - -ifeq ($(BUILD_SUN_PKG), 1) -# The -R '$ORIGIN' linker option instructs this library to search for its -# dependencies in the same directory where it resides. -ifeq ($(USE_64), 1) -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64' -else -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps' -endif -else -RPATH = -R '$$ORIGIN' -endif -
deleted file mode 100644 --- a/security/coreconf/WIN32.mk +++ /dev/null @@ -1,358 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# -# Configuration common to all versions of Windows NT -# and Windows 95 -# - -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 - MT = mt.exe - # Determine compiler version - CC_VERSION := $(shell $(CC) 2>&1 | sed -ne \ - 's|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p') - # Change the dots to spaces. - _CC_VERSION_WORDS := $(subst ., ,$(CC_VERSION)) - _CC_VMAJOR := $(word 1,$(_CC_VERSION_WORDS)) - _CC_VMINOR := $(word 2,$(_CC_VERSION_WORDS)) - _CC_RELEASE := $(word 3,$(_CC_VERSION_WORDS)) - _CC_BUILD := $(word 4,$(_CC_VERSION_WORDS)) - _MSC_VER = $(_CC_VMAJOR)$(_CC_VMINOR) - _MSC_VER_6 = 1200 - ifeq ($(_CC_VMAJOR),14) - # -DYNAMICBASE is only supported on VC8SP1 or newer, - # so be very specific here! - # VC8 is 14.00.50727.42, VC8SP1 is 14.00.50727.762 - ifeq ($(_CC_RELEASE).$(_CC_BUILD),50727.42) - USE_DYNAMICBASE = - else - ifeq ($(_CC_RELEASE).$(_CC_BUILD),50727.762) - USE_DYNAMICBASE = 1 - else - _LOSER := $(error Unknown compiler version $(CC_VERSION)) - endif - endif - endif - # if $(_CC_VMAJOR) >= 15 - # NOTE: 'sort' sorts the words in lexical order, so this test works - # only if $(_CC_VMAJOR) is two digits. - ifeq ($(firstword $(sort $(_CC_VMAJOR) 15)),15) - USE_DYNAMICBASE = 1 - endif -endif - -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) -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 - # The -mnop-fun-dllimport flag allows us to avoid a drawback of - # the dllimport attribute that a pointer to a function marked as - # dllimport cannot be used as as a constant address. - OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport - _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) - DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) - ifdef BUILD_OPT - ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) - OPTIMIZER += -Os - else - OPTIMIZER += -O2 - endif - DEFINES += -UDEBUG -U_DEBUG -DNDEBUG - 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 - OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ - -D_CRT_NONSTDC_NO_WARNINGS - OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS - ifeq ($(_MSC_VER),$(_MSC_VER_6)) - ifndef MOZ_DEBUG_SYMBOLS - OS_DLLFLAGS += -PDB:NONE - endif - endif - ifdef USE_DYNAMICBASE - OS_DLLFLAGS += -DYNAMICBASE - endif - ifdef BUILD_OPT - OS_CFLAGS += -MD - ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) - OPTIMIZER += -O1 - else - OPTIMIZER += -O2 - endif - DEFINES += -UDEBUG -U_DEBUG -DNDEBUG - DLLFLAGS += -OUT:"$@" - ifdef MOZ_DEBUG_SYMBOLS - ifdef MOZ_DEBUG_FLAGS - OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/ - else - OPTIMIZER += -Zi -Fd$(OBJDIR)/ - endif - DLLFLAGS += -DEBUG -OPT:REF - LDFLAGS += -DEBUG -OPT:REF - endif - 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 -D_CRTDBG_MAP_ALLOC - else - OS_CFLAGS += -MD - endif - 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 -OUT:"$@" - LDFLAGS += -DEBUG -ifeq ($(_MSC_VER),$(_MSC_VER_6)) -ifndef MOZ_DEBUG_SYMBOLS - LDFLAGS += -PDB:NONE -endif -endif - # Purify requires /FIXED:NO when linking EXEs. - LDFLAGS += /FIXED:NO - endif -ifneq ($(_MSC_VER),$(_MSC_VER_6)) - # Convert certain deadly warnings to errors (see list at end of file) - OS_CFLAGS += -we4002 -we4003 -we4004 -we4006 -we4009 -we4013 \ - -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \ - -we4064 -we4078 -we4087 -we4098 -we4390 -we4551 -we4553 -we4715 -endif # !MSVC6 -endif # NS_USE_GCC - -ifdef USE_64 -DEFINES += -DWIN64 -else -DEFINES += -DWIN32 -endif - -ifeq (,$(filter-out x386 x86_64,$(CPU_ARCH))) -ifdef USE_64 - DEFINES += -D_AMD64_ -else - DEFINES += -D_X86_ -endif -endif -ifeq ($(CPU_ARCH), ALPHA) - DEFINES += -D_ALPHA_=1 -endif - -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 $< $@ - - -# -# The following is NOT needed for the NSPR 2.0 library. -# - -DEFINES += -D_WINDOWS - -# override default, which is ASFLAGS = CFLAGS -ifdef NS_USE_GCC - AS = $(CC) - ASFLAGS = $(INCLUDES) -else -ifdef USE_64 - AS = ml64.exe - ASFLAGS = -Cp -Sn -Zi $(INCLUDES) -else - AS = ml.exe - ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES) -endif -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.