Commit 02db64a6 authored by Tom Ritter's avatar Tom Ritter

Bug 1350362 - Support building NSS in Firefox with MinGW on Linux, r=franziskus

--HG--
extra : amend_source : 5221cada253c3a1b84595f4920520a18c739a999
parent 770f5000
......@@ -218,7 +218,7 @@
'-Wl,--version-script,<(INTERMEDIATE_DIR)/out.>(mapfile)',
],
}],
[ 'OS=="win"', {
[ 'cc_use_gnu_ld!=1 and OS=="win"', {
# On Windows, .def files are used directly as sources.
'sources': [
'>(mapfile)',
......
......@@ -174,6 +174,7 @@
'VCCLCompilerTool': {
#TODO: -Ox optimize flags
'PreprocessorDefinitions': [
# Should be copied to mingw defines below
'MP_IS_LITTLE_ENDIAN',
'NSS_BEVAND_ARCFOUR',
'MPI_AMD64',
......@@ -185,6 +186,17 @@
},
},
}],
[ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', {
'defines': [
'MP_IS_LITTLE_ENDIAN',
'NSS_BEVAND_ARCFOUR',
'MPI_AMD64',
'MP_ASSEMBLY_MULTIPLY',
'NSS_USE_COMBA',
'USE_HW_AES',
'INTEL_GCM',
],
}],
[ 'OS!="win"', {
'conditions': [
[ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
......
......@@ -106,7 +106,7 @@
'advapi32.lib',
],
'conditions': [
[ 'target_arch=="x64"', {
[ 'cc_use_gnu_ld!=1 and target_arch=="x64"', {
'sources': [
'arcfour-amd64-masm.asm',
'mpi/mpi_amd64.c',
......@@ -115,7 +115,8 @@
'intel-aes-x64-masm.asm',
'intel-gcm-x64-masm.asm',
],
}, {
}],
[ 'cc_use_gnu_ld!=1 and target_arch!="x64"', {
# not x64
'sources': [
'mpi/mpi_x86_asm.c',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment