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/29 19:02:47]

You should not need to use <(DEPTH) here. Instead, you can use the path relative
to the GYP file being used here.

mozilla/security/nss/lib/freebl/build_config_mac.h

and rely on the fact that it will be relativized (by virtue of the _file suffix)
to the place where the compile is executing.

[wtc, 2013/01/30 02:44:02]

This works with Xcode, but not with make and ninja.

With make, I get:

In file included from <built-in>:156:
<command line>:52:10: fatal error: 
      'mozilla/security/nss/lib/freebl/build_config_mac.h' file not found

With ninja, I get:

[894/1805] CC
obj/third_party/nss/mozill...security/nss/lib/base/nss_static.error.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang -MMD -MF
obj/third_party/nss/mozilla/security/nss/lib/base/nss_static.error.o.d
-DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN
-DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_THREADING
-DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS
-DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1 -DUSE_SKIA=1
-DENABLE_TASK_MANAGER=1 -DENABLE_WEB_INTENTS=1 -DENABLE_EXTENSIONS=1
-DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1
-DENABLE_THEMES=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1
-DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1
-DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_MANAGED_USERS=1
-DMP_API_COMPATIBLE -DNSS_DISABLE_DBM -DNSS_ENABLE_ECC -DNSS_STATIC
-DNSS_USE_STATIC_LIBS -DRIJNDAEL_INCLUDE_TABLES '-DSHLIB_VERSION="3"'
'-DSOFTOKEN_SHLIB_VERSION="3"' -DUSE_UTIL_DIRECTLY -DNSS_DISABLE_ROOT_CERTS
-DNSS_DISABLE_LIBPKIX -DXP_UNIX -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
'-DSHLIB_SUFFIX="dylib"' '-DSHLIB_PREFIX="lib"'
'-DSOFTOKEN_LIB_NAME="libsoftokn3.dylib"' -DNSPR_STATIC
-DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DDEBUG -D_DEBUG
-I../../third_party/nss/mozilla/security/nss/lib/base
-I../../third_party/nss/mozilla/security/nss/lib/certdb
-I../../third_party/nss/mozilla/security/nss/lib/certhigh
-I../../third_party/nss/mozilla/security/nss/lib/cryptohi
-I../../third_party/nss/mozilla/security/nss/lib/dev
-I../../third_party/nss/mozilla/security/nss/lib/freebl
-I../../third_party/nss/mozilla/security/nss/lib/freebl/ecl
-I../../third_party/nss/mozilla/security/nss/lib/freebl/mpi
-I../../third_party/nss/mozilla/security/nss/lib/nss
-I../../third_party/nss/mozilla/security/nss/lib/pk11wrap
-I../../third_party/nss/mozilla/security/nss/lib/pkcs7
-I../../third_party/nss/mozilla/security/nss/lib/pki
-I../../third_party/nss/mozilla/security/nss/lib/smime
-I../../third_party/nss/mozilla/security/nss/lib/softoken
-I../../third_party/nss/mozilla/security/nss/lib/ssl
-I../../third_party/nss/mozilla/security/nss/lib/util
-I../../third_party/nss/mozilla/nsprpub/pr/include
-I../../third_party/nss/mozilla/nsprpub/lib/ds
-I../../third_party/nss/mozilla/nsprpub/lib/libc/include
-I../../third_party/sqlite -I../.. -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
-O0 -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof
-mmacosx-version-min=10.6 -arch i386 -Wendif-labels -Wno-unused-parameter
-Wno-missing-field-initializers -Wheader-hygiene -Wno-c++11-narrowing
-Wno-reserved-user-defined-literal -Wno-char-subscripts -Wno-unused-function
-Wno-covered-switch-default -Wno-conversion -Wno-incompatible-pointer-types
-Wno-logical-op-parentheses -Wno-switch -Wno-tautological-compare -std=c99
-Xclang -load -Xclang
/Users/wtc/chrome5/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib
-Xclang -add-plugin -Xclang find-bad-constructs -Xclang
-plugin-arg-find-bad-constructs -Xclang skip-virtuals-in-implementations
-fcolor-diagnostics -fno-strict-aliasing -include
mozilla/security/nss/lib/freebl/build_config_mac.h -fstack-protector-all  -c
../../third_party/nss/mozilla/security/nss/lib/base/error.c -o
obj/third_party/nss/mozilla/security/nss/lib/base/nss_static.error.o
In file included from <built-in>:156:
<command line>:52:10: fatal error:
'mozilla/security/nss/lib/freebl/build_config_mac.h' file not found
#include "mozilla/security/nss/lib/freebl/build_config_mac.h"
         ^
1 error generated.

+      }],
     ],
   },
   '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_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',

[wtc, 2013/01/29 04:37:54]

This is just a cleanup. I want to exclude amd64 files using
narrower rules.

           ],
         }],
         ['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',
+            # 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': {
             '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)',
             ],
           },
+          # This is ignored by ninja!
+          'cflags': [
+            '-xyzinclude', '<(forced_include_file)',
+          ],

[wtc, 2013/01/29 04:37:54]

This is intentional broken code. I discovered that cflags
blocks are ignored by Ninja, and Ninja actually honors the
xcode_settings WARNING_CFLAGS and OTHER_CFLAGS blocks.

What should I do? Just omit the cflags block?

[Ryan Sleevi, 2013/01/29 19:02:47]

I believe this is because ninja is matching the XCode behaviour, which is to
only respect OTHER_CFLAGS.

[wtc, 2013/01/30 02:44:02]

Thanks. My experiments showed that this cflags block is
ignored by the xcode, ninja, and make GYP generators. So
I removed the cflags block.

         }],
         ['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 39 matching lines @@
             '-Wno-incompatible-pointer-types',
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
 }