1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
|
--- a/a/a/nss/coreconf/rules.mk 2013-06-14 13:31:28.569204870 +0100
+++ a/a/a/nss/coreconf/rules.mk 2013-06-14 13:31:59.277567709 +0100
@@ -400,7 +400,7 @@
PWD := $(shell pwd)
ifeq (,$(findstring ;,$(PATH)))
ifndef USE_MSYS
-PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
+#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
endif
endif
endif
--- a/a/a/nss/coreconf/WIN32.mk 2013-06-14 13:31:28.557204728 +0100
+++ a/a/a/nss/coreconf/WIN32.mk 2013-06-14 13:31:59.278567724 +0100
@@ -124,7 +124,7 @@
# 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
+ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0700 -U__MMX__ -U__SSE__ -U__SSE2__
_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
--- a/a/a/nss/coreconf/WINNT.mk 2013-06-14 13:31:28.560204763 +0100
+++ a/a/a/nss/coreconf/WINNT.mk 2013-06-14 13:31:59.278567724 +0100
@@ -46,7 +46,7 @@
#
# Win NT needs -GT so that fibers can work
#
-OS_CFLAGS += -GT
+#OS_CFLAGS += -GT
# WINNT uses the lib prefix, Win95 doesn't
NSPR31_LIB_PREFIX = lib
--- a/a/a/nss/cmd/crmftest/Makefile 2013-06-14 13:31:28.678206158 +0100
+++ a/a/a/nss/cmd/crmftest/Makefile 2013-06-14 13:31:59.278567724 +0100
@@ -90,7 +90,7 @@
LDDIST = $(DIST)/lib
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(LDDIST)/sectool.lib
+#EXTRA_LIBS += $(LDDIST)/sectool.lib
endif
include ../platrules.mk
--- a/a/a/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:28.709206524 +0100
+++ a/a/a/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -61,9 +61,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
--- a/a/a/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:28.680206181 +0100
+++ a/a/a/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -59,9 +59,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
@@ -93,8 +93,8 @@
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
-MD_LIB_RELEASE_FILES = $(CHECKLOC)
-ALL_TRASH += $(CHECKLOC)
+MD_LIB_RELEASE_FILES = # $(CHECKLOC)
+#ALL_TRASH += $(CHECKLOC)
endif
#######################################################################
@@ -128,5 +128,5 @@
endif
endif
-libs install :: $(CHECKLOC)
+libs install :: #$(CHECKLOC)
--- a/a/a/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:28.681206193 +0100
+++ a/a/a/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:59.279567738 +0100
@@ -59,9 +59,9 @@
ifeq ($(OS_ARCH), WINNT)
EXTRA_LIBS += \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \
+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \
$(NULL)
else
--- a/a/a/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:28.666206016 +0100
+++ a/a/a/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:59.280567750 +0100
@@ -48,7 +48,7 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
- RES = $(OBJDIR)/$(LIBRARY_NAME).res
+ RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
endif
--- a/a/a/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:28.669206051 +0100
+++ a/a/a/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:59.280567750 +0100
@@ -75,6 +75,9 @@
-lplc4 \
-lplds4 \
-lnspr4 \
+ -lcrypt32 \
+ -ladvapi32 \
+ -lrpcrt4 \
$(NULL)
endif
--- a/a/a/nss/lib/freebl/config.mk 2013-06-14 13:31:28.593205153 +0100
+++ a/a/a/nss/lib/freebl/config.mk 2013-06-14 13:31:59.280567750 +0100
@@ -82,7 +82,7 @@
# don't want the 32 in the shared library name
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = freebl.rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:28.605205295 +0100
+++ a/a/a/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:59.281567762 +0100
@@ -254,7 +254,7 @@
#define MPI_ASM_DECL
#endif
-#ifdef MPI_AMD64
+#if defined(MPI_AMD64) && defined(MP_ASSEMBLY_MULTIPLY)
mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
--- a/a/a/nss/lib/nss/config.mk 2013-06-14 13:31:28.620205472 +0100
+++ a/a/a/nss/lib/nss/config.mk 2013-06-14 13:31:59.281567762 +0100
@@ -42,7 +42,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/smime/config.mk 2013-06-14 13:31:28.580205000 +0100
+++ a/a/a/nss/lib/smime/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -43,7 +43,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/smime.res
+RES = $(OBJDIR)/smime.res.o
RESNAME = smime.rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/softoken/config.mk 2013-06-14 13:31:28.662205969 +0100
+++ a/a/a/nss/lib/softoken/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -49,7 +49,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:28.660205945 +0100
+++ a/a/a/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:59.282567773 +0100
@@ -50,7 +50,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/ssl/config.mk 2013-06-14 13:31:28.614205402 +0100
+++ a/a/a/nss/lib/ssl/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -55,7 +55,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/ssl.res
+RES = $(OBJDIR)/ssl.res.o
RESNAME = ssl.rc
ifdef NS_USE_GCC
--- a/a/a/nss/lib/sysinit/config.mk 2013-06-14 13:31:28.674206110 +0100
+++ a/a/a/nss/lib/sysinit/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -47,8 +47,8 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
-RESNAME = $(LIBRARY_NAME).rc
+#RES = $(OBJDIR)/$(LIBRARY_NAME).res
+#RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
EXTRA_SHARED_LIBS += \
--- a/a/a/nss/lib/util/config.mk 2013-06-14 13:31:28.629205579 +0100
+++ a/a/a/nss/lib/util/config.mk 2013-06-14 13:31:59.283567784 +0100
@@ -42,7 +42,7 @@
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC
|
