Revert 34983 - Split more targets from chrome.gyp to add support for building...

chrome/nacl/sel_main.cc

 // Copyright (c) 2009 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.
 
 #include "native_client/src/include/portability.h"
 
 #if NACL_OSX
 #include <crt_externs.h>
 #endif
 
-#ifdef _WIN64  /* TODO(gregoryd): remove this when win64 issues are fixed */
-#define NACL_NO_INLINE
-#endif
-
 EXTERN_C_BEGIN
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/expiration.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
 EXTERN_C_END
@@ skipping 22 matching lines @@
 static void StopForDebuggerInit(const struct NaClApp *state) {
   /* Put xlate_base in a place where gdb can find it.  */
   nacl_global_xlate_base = state->mem_start;
 
 #ifdef __GNUC__
   _ovly_debug_event();
 #endif
 }
 
 int SelMain(const int desc, const NaClHandle handle) {
-#ifdef _WIN64
-  /* TODO(gregoryd): remove this when NaCl's service_runtime supports Win64 */
-  return 0;
-#else
   char *av[1];
   int ac = 1;
 
   char                          **envp;
   struct NaClApp                state;
   char                          *nacl_file = 0;
   int                           main_thread_only = 1;
   int                           export_addr_to = -2;
 
   struct NaClApp                *nap;
@@ skipping 126 matching lines @@
   fflush(stdout);
 
   NaClAppDtor(&state);
 
  done_file_dtor:
   fflush(stdout);
 
   NaClAllModulesFini();
 
   return ret_code;
-#endif
 }