summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 20:30:46 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 20:30:46 +0000
commitdd36368e83b0a988294e0f80e73d910dae00adfd (patch)
tree25a5492827da91b861d4377e93297472dfd1fd4a /chrome/nacl
parent1aa74be036b0319e55a2668f30f74cdfe8b4c8b7 (diff)
downloadchromium_src-dd36368e83b0a988294e0f80e73d910dae00adfd.zip
chromium_src-dd36368e83b0a988294e0f80e73d910dae00adfd.tar.gz
chromium_src-dd36368e83b0a988294e0f80e73d910dae00adfd.tar.bz2
Split more targets from chrome.gyp to add support for building Native Client for 64-bit Windows.
This CL is required for supporting Native Client on 64-bit Windows. On Win64 we will use a 64-bit executable to load NaCl modules. Since we have only one version of Chrome on Windows, this executable has to be built together with 32-bit Chrome binaries. For the targets that are required for both 32-bit and 64-bit builds, this CL moves the shared parts of the target definitions into target-specific gypi files (such as base.gypi). New 64-bit only targets are added. Since we would like to port as few code as possible at this point, some 64-bit targets include less source files or less dependencies than the original 32-bit targets. These targets will have nacl_win64 in their name - to emphasize that they should be used for NaCl only. Some 64-bit targets are identical to the 32-bit targets in everything except for the target platform - these will have only win64 in their name. TEST=none BUG=28176 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=35237 Review URL: http://codereview.chromium.org/384068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/sel_main.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index c1f56d6..4a2427b 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -8,6 +8,10 @@
#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"
@@ -50,6 +54,10 @@ static void StopForDebuggerInit(const struct NaClApp *state) {
}
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;
@@ -196,5 +204,6 @@ int SelMain(const int desc, const NaClHandle handle) {
NaClAllModulesFini();
return ret_code;
+#endif
}