Index: nss/nss.gyp |
=================================================================== |
--- nss/nss.gyp (revision 179275) |
+++ nss/nss.gyp (working copy) |
@@ -540,6 +540,7 @@ |
'mozilla/security/nss/lib/freebl/blapi.h', |
'mozilla/security/nss/lib/freebl/blapii.h', |
'mozilla/security/nss/lib/freebl/blapit.h', |
+ 'mozilla/security/nss/lib/freebl/build_config_mac.h', |
'mozilla/security/nss/lib/freebl/camellia.c', |
'mozilla/security/nss/lib/freebl/camellia.h', |
'mozilla/security/nss/lib/freebl/ctr.c', |
@@ -582,6 +583,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_arm_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', |
@@ -946,6 +949,10 @@ |
'mozilla/security/nss/lib/util/utilrename.h', |
], |
'sources!': [ |
+ # mpi_arm.c is included by mpi_arm_mac.c. |
+ # NOTE: mpi_arm.c can be used directly on Linux. mpi_arm.c will need |
+ # to be excluded conditionally if we start to build NSS on Linux. |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_arm.c', |
# primes.c is included by mpprime.c. |
'mozilla/security/nss/lib/freebl/mpi/primes.c', |
# unix_rand.c and win_rand.c are included by sysrand.c. |
@@ -1056,8 +1063,8 @@ |
], |
}], |
['target_arch=="ia32"', { |
- 'sources/': [ |
- ['exclude', 'amd64'], |
+ 'sources!': [ |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', |
], |
}], |
['OS=="mac" or OS=="ios"', { |
@@ -1072,29 +1079,26 @@ |
], |
'sources!': [ |
'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c', |
- 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', |
], |
+ 'variables': { |
+ 'forced_include_file': '<(DEPTH)/third_party/nss/mozilla/security/nss/lib/freebl/build_config_mac.h', |
+ }, |
'xcode_settings': { |
'conditions': [ |
['component == "shared_library"', { |
'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden |
}], |
], |
- # Can't use 'target_arch=="ia32"' conditional because that is |
- # only checked at GYP file generation time. |
- 'GCC_PREPROCESSOR_DEFINITIONS[arch=i386]': [ |
- '$(inherited)', |
- 'NSS_X86_OR_X64', |
- 'NSS_X86', |
- 'i386', |
+ # Define processor architecture specific macros in |
+ # <(forced_include_file). |
+ 'OTHER_CFLAGS': [ |
+ '-include', '<(forced_include_file)', |
], |
- 'GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64]': [ |
- '$(inherited)', |
- 'NSS_USE_64', |
- 'NSS_X86_OR_X64', |
- 'NSS_X64', |
- ], |
}, |
+ }, { # else: OS!="mac" and OS!="ios" |
+ 'sources!': [ |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_arm_mac.c', |
+ ], |
}], |
['OS=="win"', { |
'defines': [ |
@@ -1137,6 +1141,11 @@ |
], |
}], |
], |
+ }, { # else: OS!="win" |
+ 'sources!': [ |
+ # mpi_x86_asm.c contains MSVC inline assembly code. |
+ 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c', |
+ ], |
}], |
['clang==1', { |
'xcode_settings': { |