Fix Win64 build of Dart VM.

runtime/bin/net/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.
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
 # Revision 257452 (this should agree with "nss_rev" in DEPS).
@@ skipping 32 matching lines @@
       # Added by Dart.
       'Dart_ia32_Base': {
         'defines': [
           'NSS_X86_OR_X64',
           'NSS_X86',
           '_X86_',
         ],
       },
       # Added by Dart.
       'Dart_x64_Base': {
-        'conditions': [
-          # On Windows, Dart is always built as a 32-bit version,
-          # even if a 64-bit build is requested.
-          ['OS=="win"', {
-            'defines': [
-              'NSS_X86_OR_X64',
-              'NSS_X86',
-              '_X86_',
-              ],
-            }, {
-            'defines': [
-              'NSS_X86_OR_X64',
-              'NSS_X64',
-              'NSS_USE_64',
-          ]}],
+        'defines': [
+          'NSS_X86_OR_X64',
+          'NSS_X64',
+          'NSS_USE_64',
         ],
       },
       # Added by Dart.
       'Dart_simarm64_Base': {
         'defines': [
           'NSS_X86_OR_X64',
           'NSS_X64',
           'NSS_USE_64',
         ],
       },
       'Dart_arm64_Base': {
         'defines': [
           'NSS_USE_64',
         ],
       },
     },
     'conditions': [
       ['OS=="win"', {
         'configurations': {
           'Common_Base': {
             'msvs_configuration_attributes': {
               # Do not compile NSPR and NSS with /D _UNICODE /D UNICODE.
               'CharacterSet': '0'
             }
-          }
+          },

[ricow1, 2014/06/05 14:41:42]

place 
# Added by Dart.
here as well to easily distinguish what we added and what we got from nss

Also, you could comment that these defines are taken from the original
target_arch section below

[Vyacheslav Egorov (Google), 2014/06/05 18:05:54]

Done.

+          'Dart_ia32_Base': {
+            'defines': [
+              'NSS_X86_OR_X64',
+              'NSS_X86',
+              '_X86_',
+              'MP_ASSEMBLY_MULTIPLY',
+              'MP_ASSEMBLY_SQUARE',
+              'MP_ASSEMBLY_DIV_2DX1D',
+              'MP_USE_UINT_DIGIT',
+              'MP_NO_MP_WORD',
+            ],
+          },
+          'Dart_x64_Base': {
+            'defines': [
+              'NSS_USE_64',
+              'NSS_X86_OR_X64',
+              'NSS_X64',
+              '_AMD64_',
+              'MP_CHAR_STORE_SLOW',
+              'MP_IS_LITTLE_ENDIAN',
+              'WIN64',
+            ],
+          },
         },
         'defines!': [
           'WIN32_LEAN_AND_MEAN',
         ],
       }],
     ],
   },
   # Added by Dart.  We do not indent, so diffs with the original are clearer.
   'conditions': [[ 'dart_io_support==1', {
   'targets': [
@@ skipping 323 matching lines @@
             # Added by Dart.
             'os_linux.S',
           ],
           # Changed by Dart:
           # nss_directory contains .., which is bad in a regular expression.
           # So we use the partial match by dropping '^' from '^nspr/...
           'sources/': [
             ['exclude', 'nspr/pr/src/md/unix/'],
             ['exclude', 'nspr/pr/src/pthreads/'],
           ],
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'defines': [
-                '_X86_',
-              ],
-            }],
-          ],
+          # Changed by Dart. We don't use target_arch.
+          # 'conditions': [
+          #  ['target_arch=="ia32"', {
+          #    'defines': [
+          #      '_X86_',
+          #    ],
+          #  }],
+          # ],

[srdjan, 2014/06/05 17:00:46]

Is the above dead code that should be removed?

[Vyacheslav Egorov (Google), 2014/06/05 18:05:55]

Apparently we only comment things, but don't remove them to make it easier to
merge nss.gyp from upsteam

         }],
         ['component == "static_library"', {
           'defines': [
             'NSPR_STATIC',
           ],
           'direct_dependent_settings': {
             'defines': [
               'NSPR_STATIC',
             ],
           },
@@ skipping 134 matching lines @@
       },
     },
     {
       'target_name': 'nss_static_dart',  # Added by Dart (the _dart postfix)
       'type': 'static_library',
       'toolsets':['host','target'],
       # This target is an implementation detail - the public dependencies
       # should be on 'nss'.
       'suppress_wildcard': 1,
       'sources': [
+        'os_windows.c',
         '<(nss_directory)/nss/lib/base/arena.c',
         '<(nss_directory)/nss/lib/base/base.h',
         '<(nss_directory)/nss/lib/base/baset.h',
         '<(nss_directory)/nss/lib/base/error.c',
         '<(nss_directory)/nss/lib/base/errorval.c',
         '<(nss_directory)/nss/lib/base/hash.c',
         '<(nss_directory)/nss/lib/base/hashops.c',
         '<(nss_directory)/nss/lib/base/item.c',
         '<(nss_directory)/nss/lib/base/libc.c',
         '<(nss_directory)/nss/lib/base/list.c',
@@ skipping 692 matching lines @@
             'WIN95',
             '_WINDOWS',
           ],
           'direct_dependent_settings': {
             'defines': [
               '_WINDOWS',
             ],
           },
           'sources!': [
             '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
+            # If needed it will be included by os_windows.c.
+            '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
           ],
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'defines': [
-                'NSS_X86_OR_X64',
-                'NSS_X86',
-                '_X86_',
-                'MP_ASSEMBLY_MULTIPLY',
-                'MP_ASSEMBLY_SQUARE',
-                'MP_ASSEMBLY_DIV_2DX1D',
-                'MP_USE_UINT_DIGIT',
-                'MP_NO_MP_WORD',
-              ],
-            }],
-            ['target_arch=="x64"', {
-              'defines': [
-                'NSS_USE_64',
-                'NSS_X86_OR_X64',
-                'NSS_X64',
-                '_AMD64_',
-                'MP_CHAR_STORE_SLOW',
-                'MP_IS_LITTLE_ENDIAN',
-                'WIN64',
-              ],
-              'sources!': [
-                '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
-                '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
-              ],
-            }],
-          ],
+          # Changed by Dart. We don't use target_arch. This was moved into
+          # configurations instead.
+          # 'conditions': [
+          #   ['target_arch=="ia32"', {
+          #     'defines': [
+          #       'NSS_X86_OR_X64',
+          #       'NSS_X86',
+          #       '_X86_',
+          #       'MP_ASSEMBLY_MULTIPLY',
+          #       'MP_ASSEMBLY_SQUARE',
+          #       'MP_ASSEMBLY_DIV_2DX1D',
+          #       'MP_USE_UINT_DIGIT',
+          #       'MP_NO_MP_WORD',
+          #     ],
+          #   }],
+          #   ['target_arch=="x64"', {
+          #     'defines': [
+          #       'NSS_USE_64',
+          #       'NSS_X86_OR_X64',
+          #       'NSS_X64',
+          #       '_AMD64_',
+          #       'MP_CHAR_STORE_SLOW',
+          #       'MP_IS_LITTLE_ENDIAN',
+          #       'WIN64',
+          #     ],
+          #     'sources!': [
+          #       '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
+          #       '<(nss_directory)/nss/lib/freebl/mpi/mpi_x86_asm.c',
+          #     ],
+          #    }],
+          # ],

[srdjan, 2014/06/05 17:00:46]

ditto?

[Vyacheslav Egorov (Google), 2014/06/05 18:05:55]

see the reasoning above.

         }, { # else: OS!="win"
           'sources!': [
+            'os_windows.c',
             # mpi_x86_asm.c contains MSVC inline assembly code.
             '<(nss_directory)/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*".
@@ skipping 12 matching lines @@
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
   }]],
 }