Use the ARM assembly code in mpi_arm.c for iOS.

nss/nss.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['OS=="ios"', {
         'exclude_nss_root_certs%': 0,
         'exclude_nss_libpkix%': 0,
       }, {
         'exclude_nss_root_certs%': 1,
         'exclude_nss_libpkix%': 1,
       }],
+      ['OS=="mac" or OS=="ios"', {
+        'forced_include_file%': '<(DEPTH)/third_party/nss/mozilla/security/nss/lib/freebl/build_config_mac.h',

[Ryan Sleevi, 2013/01/30 23:23:35]

You don't need to use the "%" suffix here. That is used to indicate an optional
variable that may be set by another layer (eg: build/common.gypi). This variable
is entirely local to the file.

You should also be able to remove this variable into the nss target, where it
lives. There's no need to place it at the top like this. Line 1082 should
suffice.

+      }],
     ],
   },
   'target_defaults': {
     'configurations': {
       'Debug': {
         'defines': [
           'DEBUG',
           '_DEBUG',
         ],
       },
@@ skipping 550 matching lines @@
         'mozilla/security/nss/lib/freebl/jpake.c',
         'mozilla/security/nss/lib/freebl/md2.c',
         'mozilla/security/nss/lib/freebl/md5.c',
         'mozilla/security/nss/lib/freebl/mpi/logtab.h',
         'mozilla/security/nss/lib/freebl/mpi/mpcpucache.c',
         'mozilla/security/nss/lib/freebl/mpi/mpi-config.h',
         'mozilla/security/nss/lib/freebl/mpi/mpi-priv.h',
         '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',
         'mozilla/security/nss/lib/freebl/mpi/mpmontg.c',
         'mozilla/security/nss/lib/freebl/mpi/mpprime.c',
         'mozilla/security/nss/lib/freebl/mpi/mpprime.h',
         'mozilla/security/nss/lib/freebl/mpi/mp_gf2m-priv.h',
         'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c',
         'mozilla/security/nss/lib/freebl/mpi/mp_gf2m.h',
         'mozilla/security/nss/lib/freebl/mpi/primes.c',
@@ skipping 454 matching lines @@
           ],
           'sources!': [
             'mozilla/security/nss/lib/certhigh/certvfypkix.c',
             'mozilla/security/nss/lib/certhigh/certvfypkixprint.c',
           ],
           'include_dirs/': [
             ['exclude', '^mozilla/security/nss/lib/libpkix/'],
           ],
         }],
         ['target_arch=="ia32"', {
-          'sources/': [
-            ['exclude', 'amd64'],
+          'sources!': [
+            'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
           ],
         }],
         ['OS=="mac" or OS=="ios"', {
           'defines': [
             'XP_UNIX',
             'DARWIN',
             'HAVE_STRERROR',
             'HAVE_BSD_FLOCK',
             'SHLIB_SUFFIX=\"dylib\"',
             'SHLIB_PREFIX=\"lib\"',
             'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"',
           ],
           'sources!': [
             'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
-            'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c',
+            # mpi_arm.c is included by mpi_arm_mac.c.
+            'mozilla/security/nss/lib/freebl/mpi/mpi_arm.c',

[Ryan Sleevi, 2013/01/30 23:23:35]

Is there ever a situation where we actually want to include mpi_arm.c? It seems
like this should just be an unconditional 'sources!' (the benefit to listing in
'sources' to begin with is so that it still shows up in IDEs, even if its not
directly compiled). Perhaps ~ line 1040?

[wtc, 2013/01/30 23:51:37]

mpi_arm.c could be used directly for Linux/arm. So I am
preparing for the future when we may want to build NSS
on Linux.

Should I deal with that when we cross that bridge and just
do an unconditional 'sources!' now?

           ],
           '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',
-            ],
-            'GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64]': [
-              '$(inherited)',
-              'NSS_USE_64',
-              'NSS_X86_OR_X64',
-              'NSS_X64',
+            # Define processor architecture specific macros in
+            # <(forced_include_file).
+            'OTHER_CFLAGS': [
+              '-include', '<(forced_include_file)',
             ],
           },
+        }, { # else: OS!="mac" and OS!="ios"
+          'sources!': [
+            'mozilla/security/nss/lib/freebl/mpi/mpi_arm_mac.c',
+          ],
         }],
         ['OS=="win"', {
           'defines': [
             'SHLIB_SUFFIX=\"dll\"',
             'SHLIB_PREFIX=\"\"',
             'SOFTOKEN_LIB_NAME=\"softokn3.dll\"',
             'XP_PC',
             'WIN32',
             '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',
             ],
           },
           'conditions': [
             ['target_arch=="ia32"', {
               'defines': [
                 'NSS_X86_OR_X64',
                 'NSS_X86',
@@ skipping 11 matching lines @@
                 'NSS_X86_OR_X64',
                 'NSS_X64',
                 'WIN64',
               ],
               'sources!': [
                 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
                 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c',
               ],
             }],
           ],
+        }, { # 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': {
             'WARNING_CFLAGS': [
               # nss doesn't explicitly cast between different enum types.
               '-Wno-conversion',
               # nss passes "const char*" through "void*".
               '-Wno-incompatible-pointer-types',
               # nss prefers `a && b || c` over `(a && b) || c`.
               '-Wno-logical-op-parentheses',
               # nss doesn't use exhaustive switches on enums
               '-Wno-switch',
               # nss has some `unsigned < 0` checks.
               '-Wno-tautological-compare',
             ],
           },
           'cflags': [
             '-Wno-conversion',
             '-Wno-incompatible-pointer-types',
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
 }