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

Side by Side Diff: chrome/nacl/sel_main.cc

Issue 384068: gyp changes - add support for building Native Client for 64-bit Windows... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/nacl.gypi ('k') | webkit/glue/webkit_glue_dummy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "native_client/src/include/portability.h" 5 #include "native_client/src/include/portability.h"
6 6
7 #if NACL_OSX 7 #if NACL_OSX
8 #include <crt_externs.h> 8 #include <crt_externs.h>
9 #endif 9 #endif
10 10
11 #ifdef _WIN64 /* TODO(gregoryd): remove this when win64 issues are fixed */
12 #define NACL_NO_INLINE
13 #endif
14
11 EXTERN_C_BEGIN 15 EXTERN_C_BEGIN
12 #include "native_client/src/shared/platform/nacl_sync.h" 16 #include "native_client/src/shared/platform/nacl_sync.h"
13 #include "native_client/src/shared/platform/nacl_sync_checked.h" 17 #include "native_client/src/shared/platform/nacl_sync_checked.h"
14 #include "native_client/src/trusted/service_runtime/nacl_globals.h" 18 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
15 #include "native_client/src/trusted/service_runtime/expiration.h" 19 #include "native_client/src/trusted/service_runtime/expiration.h"
16 #include "native_client/src/trusted/service_runtime/nacl_app.h" 20 #include "native_client/src/trusted/service_runtime/nacl_app.h"
17 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h" 21 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
18 #include "native_client/src/trusted/service_runtime/sel_ldr.h" 22 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
19 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h" 23 #include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
20 EXTERN_C_END 24 EXTERN_C_END
(...skipping 22 matching lines...) Expand all
43 static void StopForDebuggerInit(const struct NaClApp *state) { 47 static void StopForDebuggerInit(const struct NaClApp *state) {
44 /* Put xlate_base in a place where gdb can find it. */ 48 /* Put xlate_base in a place where gdb can find it. */
45 nacl_global_xlate_base = state->mem_start; 49 nacl_global_xlate_base = state->mem_start;
46 50
47 #ifdef __GNUC__ 51 #ifdef __GNUC__
48 _ovly_debug_event(); 52 _ovly_debug_event();
49 #endif 53 #endif
50 } 54 }
51 55
52 int SelMain(const int desc, const NaClHandle handle) { 56 int SelMain(const int desc, const NaClHandle handle) {
57 #ifdef _WIN64
58 /* TODO(gregoryd): remove this when NaCl's service_runtime supports Win64 */
59 return 0;
60 #else
53 char *av[1]; 61 char *av[1];
54 int ac = 1; 62 int ac = 1;
55 63
56 char **envp; 64 char **envp;
57 struct NaClApp state; 65 struct NaClApp state;
58 char *nacl_file = 0; 66 char *nacl_file = 0;
59 int main_thread_only = 1; 67 int main_thread_only = 1;
60 int export_addr_to = -2; 68 int export_addr_to = -2;
61 69
62 struct NaClApp *nap; 70 struct NaClApp *nap;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 fflush(stdout); 197 fflush(stdout);
190 198
191 NaClAppDtor(&state); 199 NaClAppDtor(&state);
192 200
193 done_file_dtor: 201 done_file_dtor:
194 fflush(stdout); 202 fflush(stdout);
195 203
196 NaClAllModulesFini(); 204 NaClAllModulesFini();
197 205
198 return ret_code; 206 return ret_code;
207 #endif
199 } 208 }
200 209
OLDNEW
« no previous file with comments | « chrome/nacl.gypi ('k') | webkit/glue/webkit_glue_dummy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698