Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/nss.gyp

Issue 10828060: Use the ARM assembly code in mpi_arm.c for iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Sync with tip of tree and use -include <forced_include_header> Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nss/mozilla/security/nss/lib/freebl/mpi/mpi_mac.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/nss.gyp
===================================================================
--- nss/nss.gyp (revision 179275)
+++ nss/nss.gyp (working copy)
@@ -12,6 +12,9 @@
'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,
wtc 2013/01/30 02:44:02 This works with Xcode, but not with make and ninja
+ }],
],
},
'target_defaults': {
@@ -582,6 +585,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',
@@ -1056,8 +1061,8 @@
],
}],
['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 fi
],
}],
['OS=="mac" or OS=="ios"', {
@@ -1072,6 +1077,9 @@
],
'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': {
@@ -1080,21 +1088,16 @@
'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',
- ],
},
+ # 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
Ryan Sleevi 2013/01/29 19:02:47 I believe this is because ninja is matching the XC
wtc 2013/01/30 02:44:02 Thanks. My experiments showed that this cflags blo
}],
['OS=="win"', {
'defines': [
@@ -1106,6 +1109,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',
« no previous file with comments | « nss/mozilla/security/nss/lib/freebl/mpi/mpi_mac.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698