diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 19:01:12 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 19:01:12 +0000 |
| commit | ad062b1f1ab9f1175da716839f18645e43a660f8 (patch) | |
| tree | d29fd03c33f2283904be5e826a068a36d2e3aba9 | |
| parent | ab1d51fa6ec15804c38ae2df07d356bfffb0abbf (diff) | |
| download | chromium_src-ad062b1f1ab9f1175da716839f18645e43a660f8.zip chromium_src-ad062b1f1ab9f1175da716839f18645e43a660f8.tar.gz chromium_src-ad062b1f1ab9f1175da716839f18645e43a660f8.tar.bz2 | |
Add ftol workaround for VS2013
The .obj was taken from
https://connect.microsoft.com/VisualStudio/feedback/details/808199
offered as a workaround by Microsoft. This fixes the floating point
stack going unbalanced.
This is fixed in Update 2, and can be removed once that's rolled
out.
R=cpu@chromium.org, jam@chromium.org
BUG=348525
Review URL: https://codereview.chromium.org/186333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254792 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/win/ftol3.obj | bin | 0 -> 8246 bytes | |||
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 8 |
4 files changed, 24 insertions, 0 deletions
diff --git a/build/win/ftol3.obj b/build/win/ftol3.obj Binary files differnew file mode 100644 index 0000000..dc9d9ed --- /dev/null +++ b/build/win/ftol3.obj diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index b0a72f4..d46c642 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3399,6 +3399,14 @@ ['OS=="win" and chromium_win_pch==0', { 'msvs_shard': 4, }], + ['OS=="win" and target_arch=="ia32"', { + 'sources': [ + # TODO(scottmg): This is a workaround for + # http://crbug.com/348525 that affects VS2013 before Update 2. + # This should be removed once Update 2 is released. + '../build/win/ftol3.obj', + ], + }], ['OS=="win"', { 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index e6a5b25..4bf28c8 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -579,6 +579,14 @@ 'app/client_util.cc', ], }], + ['OS=="win" and target_arch=="ia32"', { + 'sources': [ + # TODO(scottmg): This is a workaround for + # http://crbug.com/348525 that affects VS2013 before Update 2. + # This should be removed once Update 2 is released. + '../build/win/ftol3.obj', + ], + }], ['OS=="win" and component=="shared_library"', { 'defines': ['COMPILE_CONTENT_STATICALLY'], }], diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 0e29848..f2fad71 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -451,6 +451,14 @@ 'renderer/extensions/tts_custom_bindings.cc', ], }], + ['OS=="win" and target_arch=="ia32"', { + 'sources': [ + # TODO(scottmg): This is a workaround for + # http://crbug.com/348525 that affects VS2013 before Update 2. + # This should be removed once Update 2 is released. + '../build/win/ftol3.obj', + ], + }], ['OS=="win"', { 'dependencies': [ '../chrome_elf/chrome_elf.gyp:chrome_elf', |