Reland "msvs/ninja win: Fix support for ImageHasSafeExceptionHandlers"

test/win/linker-flags/safeseh.gyp

Index: test/win/linker-flags/safeseh.gyp
diff --git a/test/win/linker-flags/safeseh.gyp b/test/win/linker-flags/safeseh.gyp
index 61036200519e332cdf9a9ad296d5465f2bc177a5..d4a62074b8f94c1fa33c7ffc95a2db78603f9d2f 100644
--- a/test/win/linker-flags/safeseh.gyp
+++ b/test/win/linker-flags/safeseh.gyp
@@ -3,11 +3,28 @@
 # found in the LICENSE file.
 
 {
- 'targets': [
+  'target_defaults': {
+    'configurations': {
+      'Default': {
+        'msvs_configuration_platform': 'Win32',
+      },
+      'Default_x64': {
+        'inherit_from': ['Default'],
+        'msvs_configuration_platform': 'x64',
+      },
+    },
+  },
+  'targets': [
     {
       'target_name': 'test_safeseh_default',
       'type': 'executable',
       'msvs_settings': {
+        # By default, msvs passes /SAFESEH for Link, but not for MASM.  In
+        # order for test_safeseh_default to link successfully, we need to
+        # explicitly specify /SAFESEH for MASM.
+        'MASM': {
+          'UseSafeExceptionHandlers': 'true',
+        },
       },
       'sources': [
         'safeseh_hello.cc',
@@ -43,5 +60,20 @@
         'safeseh_zero.asm',
       ],
     },
+    {
+      # x64 targets cannot have ImageHasSafeExceptionHandlers or
+      # UseSafeExceptionHandlers set.
+      'target_name': 'test_safeseh_x64',
+      'type': 'executable',
+      'configurations': {
+        'Default': {
+          'msvs_target_platform': 'x64',
+        },
+      },
+      'sources': [
+        'safeseh_hello.cc',
+        'safeseh_zero64.asm',
+      ],
+    },
   ]
 }