Index: nss/nss.gyp |
=================================================================== |
--- nss/nss.gyp (revision 148841) |
+++ nss/nss.gyp (working copy) |
@@ -574,6 +574,8 @@ |
'mozilla/security/nss/lib/freebl/mpi/mpi.c', |
'mozilla/security/nss/lib/freebl/mpi/mpi.h', |
'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_arm.c', |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_mac.c', |
'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', |
'mozilla/security/nss/lib/freebl/mpi/mplogic.c', |
'mozilla/security/nss/lib/freebl/mpi/mplogic.h', |
@@ -1045,8 +1047,8 @@ |
], |
}], |
['target_arch=="ia32"', { |
- 'sources/': [ |
- ['exclude', 'amd64'], |
+ 'sources!': [ |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', |
], |
}], |
['OS=="mac" or OS=="ios"', { |
@@ -1060,6 +1062,9 @@ |
'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"', |
], |
'sources!': [ |
+ # mpi_arm.c is included by mpi_mac.c. |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_arm.c', |
+ # mpi_x86_asm.c contains MSVC inline assembly code. |
'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', |
], |
'xcode_settings': { |
wtc
2012/08/02 02:47:08
I just discovered that this entire xcode_settings
Mark Mentovai
2012/08/02 14:50:34
wtc wrote:
Nico
2012/08/02 15:07:15
Correct, that's not implemented for ninja (http://
|
@@ -1082,6 +1087,13 @@ |
'NSS_X86_OR_X64', |
'NSS_X64', |
], |
+ 'GCC_PREPROCESSOR_DEFINITIONS[arch=arm*]': [ |
wtc
2012/11/26 22:22:44
I remember this CL is blocked by my inability to s
Ryan Sleevi
2012/11/26 22:32:16
For iOS, we should be able to map this into an OS=
|
+ '$(inherited)', |
+ 'MP_ASSEMBLY_MULTIPLY', |
+ 'MP_ASSEMBLY_SQUARE', |
+ 'MP_USE_UINT_DIGIT', |
+ 'SHA_NO_LONG_LONG', |
+ ], |
}, |
}], |
['OS=="win"', { |
@@ -1094,6 +1106,10 @@ |
'WIN95', |
'_WINDOWS', |
], |
+ 'sources!': [ |
+ # mpi_arm.c contains GCC inline assembly code. |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_arm.c', |
+ ], |
'direct_dependent_settings': { |
'defines': [ |
'_WINDOWS', |