          'base/win/enum_variant.cc',
          'base/win/event_trace_controller.cc',
          'base/win/event_trace_provider.cc',
-@@ -712,6 +713,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+@@ -712,6 +712,7 @@ def write_gn_ninja(path, root_gen_dir, options):
      ])
  
      libs.extend([

       'base/files/file_enumerator.cc',
       'base/files/file_path.cc',
       'base/files/file_path_constants.cc',
@@ -523,6 +522,7 @@ def write_gn_ninja(path, root_gen_dir, options):
         'base/files/memory_mapped_file_posix.cc',
         'base/message_loop/message_pump_libevent.cc',
         'base/posix/file_descriptor_shuffle.cc',

# Remove posix from common sources and switch to implicit machine linking

--- a/tools/gn/bootstrap/bootstrap.py.orig
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -334,8 +334,7 @@ def write_gn_ninja(path, root_gen_dir, options):
         '/GR-',
         '/D_HAS_EXCEPTIONS=0',
     ])
-    # TODO(tim): Support for 64bit builds?
-    ldflags.extend(['/MACHINE:x86', '/DEBUG'])
+    ldflags.extend(['/DEBUG'])
 
   static_libraries = {
       'base': {'sources': [], 'tool': 'cxx', 'include_dirs': []},
@@ -379,7 +378,6 @@ def write_gn_ninja(path, root_gen_dir, options):
       'base/debug/task_annotator.cc',
       'base/environment.cc',
       'base/files/file.cc',
