2018-05-04 16:08:28 +02:00
|
|
|
#
|
|
|
|
# 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
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
LDFLAGS += -nologo
|
2018-05-04 16:08:28 +02:00
|
|
|
AR = lib
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
AR += -nologo -OUT:$@
|
2018-05-04 16:08:28 +02:00
|
|
|
RANLIB = echo
|
|
|
|
BSDECHO = echo
|
|
|
|
RC = rc.exe
|
|
|
|
MT = mt.exe
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
# Check for clang-cl
|
|
|
|
CLANG_CL := $(shell expr `$(CC) -? 2>&1 | grep -w clang | wc -l` \> 0)
|
2018-05-04 16:08:28 +02:00
|
|
|
# Determine compiler version
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
ifeq ($(CLANG_CL),1)
|
|
|
|
# clang-cl pretends to be MSVC 2012.
|
|
|
|
CC_VERSION := 17.00.00.00
|
|
|
|
else
|
|
|
|
CC_VERSION := $(shell $(CC) 2>&1 | sed -ne \
|
2018-05-04 16:08:28 +02:00
|
|
|
's|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p')
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
endif
|
2018-05-04 16:08:28 +02:00
|
|
|
# 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
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
# VC10 (2010) is 16.00.30319.01, VC10SP1 is 16.00.40219.01.
|
|
|
|
_MSC_VER_GE_10SP1 := $(shell expr $(_MSC_VER) \> 1600 \| \
|
|
|
|
$(_MSC_VER) = 1600 \& $(_CC_RELEASE) \>= 40219)
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
# VC11 (2012).
|
|
|
|
_MSC_VER_GE_11 := $(shell expr $(_MSC_VER) \>= 1700)
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
# VC12 (2013).
|
|
|
|
_MSC_VER_GE_12 := $(shell expr $(_MSC_VER) \>= 1800)
|
2018-05-04 16:08:28 +02:00
|
|
|
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
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
OS_CFLAGS += -mwindows -mms-bitfields
|
2018-05-04 16:08:28 +02:00
|
|
|
_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
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
#
|
|
|
|
# Define USE_DEBUG_RTL if you want to use the debug runtime library
|
|
|
|
# (RTL) in the debug build.
|
|
|
|
# Define USE_STATIC_RTL if you want to use the static RTL.
|
|
|
|
#
|
|
|
|
ifdef USE_DEBUG_RTL
|
|
|
|
ifdef USE_STATIC_RTL
|
|
|
|
OS_CFLAGS += -MTd
|
|
|
|
else
|
|
|
|
OS_CFLAGS += -MDd
|
|
|
|
endif
|
|
|
|
OS_CFLAGS += -D_CRTDBG_MAP_ALLOC
|
|
|
|
else
|
|
|
|
ifdef USE_STATIC_RTL
|
|
|
|
OS_CFLAGS += -MT
|
|
|
|
else
|
|
|
|
OS_CFLAGS += -MD
|
|
|
|
endif
|
|
|
|
endif
|
2018-05-04 16:08:28 +02:00
|
|
|
ifdef BUILD_OPT
|
|
|
|
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
|
|
|
|
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 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
# NSS has too many of these to fix, downgrade the warning
|
|
|
|
# Disable C4267: conversion from 'size_t' to 'type', possible loss of data
|
|
|
|
# Disable C4244: conversion from 'type1' to 'type2', possible loss of data
|
|
|
|
# Disable C4018: 'expression' : signed/unsigned mismatch
|
|
|
|
OS_CFLAGS += -w44267 -w44244 -w44018
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
ifeq ($(_MSC_VER_GE_12),1)
|
2018-05-04 16:08:28 +02:00
|
|
|
OS_CFLAGS += -FS
|
|
|
|
endif
|
|
|
|
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_
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
# Use subsystem 5.02 to allow running on Windows XP.
|
|
|
|
ifeq ($(_MSC_VER_GE_11),1)
|
|
|
|
LDFLAGS += -SUBSYSTEM:CONSOLE,5.02
|
|
|
|
endif
|
2018-05-04 16:08:28 +02:00
|
|
|
else
|
|
|
|
DEFINES += -D_X86_
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
# VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
# SSE2. Clang-cl gets confused by -arch:IA32, so don't add it.
|
|
|
|
# (See https://llvm.org/bugs/show_bug.cgi?id=24335)
|
|
|
|
# Use subsystem 5.01 to allow running on Windows XP.
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
ifeq ($(_MSC_VER_GE_11),1)
|
cherry-picked mozilla NSS upstream changes (to rev bad5fd065fa1, which is on par with 3.20):
bug1001332, 56b691c003ad, bug1086145, bug1054069, bug1155922, bug991783, bug1125025, bug1162521, bug1162644, bug1132941, bug1164364, bug1166205, bug1166163, bug1166515, bug1138554, bug1167046, bug1167043, bug1169451, bug1172128, bug1170322, bug102794, bug1128184, bug557830, bug1174648, bug1180244, bug1177784, bug1173413, bug1169174, bug1084669, bug951455, bug1183395, bug1177430, bug1183827, bug1160139, bug1154106, bug1142209, bug1185033, bug1193467, bug1182667(with sha512 changes backed out, which breaks VC6 compilation), bug1158489, bug337796
2018-07-12 15:44:51 +02:00
|
|
|
ifneq ($(CLANG_CL),1)
|
|
|
|
OS_CFLAGS += -arch:IA32
|
|
|
|
endif
|
|
|
|
LDFLAGS += -SUBSYSTEM:CONSOLE,5.01
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
endif
|
2018-05-04 16:08:28 +02:00
|
|
|
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
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
ASFLAGS = -nologo -Cp -Sn -Zi $(INCLUDES)
|
2018-05-04 16:08:28 +02:00
|
|
|
else
|
|
|
|
AS = ml.exe
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
ASFLAGS = -nologo -Cp -Sn -Zi -coff $(INCLUDES)
|
2018-05-04 16:08:28 +02:00
|
|
|
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.
|
|
|
|
#
|
|
|
|
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
|
|
|
|
|
|
|
|
# list of MSVC warnings converted to errors above:
|
|
|
|
# 4002: too many actual parameters for macro 'identifier'
|
|
|
|
# 4003: not enough actual parameters for macro 'identifier'
|
|
|
|
# 4004: incorrect construction after 'defined'
|
|
|
|
# 4006: #undef expected an identifier
|
|
|
|
# 4009: string too big; trailing characters truncated
|
|
|
|
# 4015: 'identifier' : type of bit field must be integral
|
|
|
|
# 4028: formal parameter different from declaration
|
|
|
|
# 4033: 'function' must return a value
|
|
|
|
# 4035: 'function' : no return value
|
|
|
|
# 4045: 'identifier' : array bounds overflow
|
|
|
|
# 4047: 'function' : 'type 1' differs in levels of indirection from 'type 2'
|
|
|
|
# 4053: one void operand for '?:'
|
|
|
|
# 4054: 'conversion' : from function pointer 'type1' to data pointer 'type2'
|
|
|
|
# 4059: pascal string too big, length byte is length % 256
|
|
|
|
# 4063: case 'identifier' is not a valid value for switch of enum 'identifier'
|
|
|
|
# 4064: switch of incomplete enum 'identifier'
|
|
|
|
# 4078: case constant 'value' too big for the type of the switch expression
|
|
|
|
# 4087: 'function' : declared with 'void' parameter list
|
|
|
|
# 4090: 'function' : different 'const' qualifiers
|
|
|
|
# 4098: 'function' : void function returning a value
|
|
|
|
# 4390: ';' : empty controlled statement found; is this the intent?
|
|
|
|
# 4541: RTTI train wreck
|
|
|
|
# 4715: not all control paths return a value
|
|
|
|
# 4013: function undefined; assuming extern returning int
|
|
|
|
# 4553: '==' : operator has no effect; did you intend '='?
|
|
|
|
# 4551: function call missing argument list
|
|
|
|
|