Commit 728269ad authored by jschuh@chromium.org's avatar jschuh@chromium.org

Make all base targets build on Win64

BUG=166496
BUG=167187

Review URL: https://chromiumcodereview.appspot.com/11825006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175916 0039d316-1c4b-4281-b951-d872f2087c98
parent b6902744
...@@ -273,6 +273,12 @@ ...@@ -273,6 +273,12 @@
'../build/linux/system.gyp:gtk', '../build/linux/system.gyp:gtk',
], ],
}], }],
['OS == "win"', {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [
4267,
],
}],
], ],
'export_dependent_settings': [ 'export_dependent_settings': [
'base', 'base',
...@@ -711,6 +717,10 @@ ...@@ -711,6 +717,10 @@
'threading/worker_pool_posix_unittest.cc', 'threading/worker_pool_posix_unittest.cc',
'message_pump_libevent_unittest.cc', 'message_pump_libevent_unittest.cc',
], ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [
4267,
],
}, { # OS != "win" }, { # OS != "win"
'dependencies': [ 'dependencies': [
'../third_party/libevent/libevent.gyp:libevent' '../third_party/libevent/libevent.gyp:libevent'
......
...@@ -17,7 +17,8 @@ TEST(CPU, RunExtendedInstructions) { ...@@ -17,7 +17,8 @@ TEST(CPU, RunExtendedInstructions) {
// Retrieve the CPU information. // Retrieve the CPU information.
base::CPU cpu; base::CPU cpu;
#if defined(OS_WIN) // TODO(jschuh): crbug.com/168866 Find a way to enable this on Win64.
#if defined(OS_WIN) && !defined(_M_X64)
ASSERT_TRUE(cpu.has_mmx()); ASSERT_TRUE(cpu.has_mmx());
// Execute an MMX instruction. // Execute an MMX instruction.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment