diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 20:29:03 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 20:29:03 +0000 |
| commit | c56bef4dc5a6651e2b0ff620f45bff738a48dae8 (patch) | |
| tree | 4aef500d7374ed62d267000e7bbcb2d8d32f5356 /base/third_party | |
| parent | 4198e75ed553b89f573bf7178ee32aa6317af090 (diff) | |
| download | chromium_src-c56bef4dc5a6651e2b0ff620f45bff738a48dae8.zip chromium_src-c56bef4dc5a6651e2b0ff620f45bff738a48dae8.tar.gz chromium_src-c56bef4dc5a6651e2b0ff620f45bff738a48dae8.tar.bz2 | |
Fixes to get base compiling on VS2013
- Missing includes of <algorithm> for std::min/std::max.
- Update prep_libc.py for different obj path in runtime library.
- Disable optimization in a couple files that currently fail in /O2.
Upstream bugs filed that are supposedly fixed in the next release.
R=thakis@chromium.org
BUG=288948
Review URL: https://codereview.chromium.org/26885007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
| -rw-r--r-- | base/third_party/dmg_fp/README.chromium | 2 | ||||
| -rw-r--r-- | base/third_party/dmg_fp/dtoa.cc | 6 | ||||
| -rw-r--r-- | base/third_party/dmg_fp/vs2013-optimization.patch | 18 |
3 files changed, 25 insertions, 1 deletions
diff --git a/base/third_party/dmg_fp/README.chromium b/base/third_party/dmg_fp/README.chromium index 10db408..33ab78b 100644 --- a/base/third_party/dmg_fp/README.chromium +++ b/base/third_party/dmg_fp/README.chromium @@ -19,4 +19,4 @@ List of changes made to original code: float_precision_crash.patch and crbug.com/123157 - Fix for 'warning C4703: potentially uninitialized local pointer variable' in VS2012. - + - Disable optimization on VS2013 pending fix of compiler optimization bug. diff --git a/base/third_party/dmg_fp/dtoa.cc b/base/third_party/dmg_fp/dtoa.cc index 4eb9f0e..b03ccff 100644 --- a/base/third_party/dmg_fp/dtoa.cc +++ b/base/third_party/dmg_fp/dtoa.cc @@ -179,6 +179,12 @@ * used for input more than STRTOD_DIGLIM digits long (default 40). */ +#if defined _MSC_VER && _MSC_VER == 1800 +// TODO(scottmg): VS2013 RC ICEs on a bunch of functions in this file. +// This should be removed after RTM. See http://crbug.com/288948. +#pragma optimize("", off) +#endif + #define IEEE_8087 #define NO_HEX_FP diff --git a/base/third_party/dmg_fp/vs2013-optimization.patch b/base/third_party/dmg_fp/vs2013-optimization.patch new file mode 100644 index 0000000..d91b370 --- /dev/null +++ b/base/third_party/dmg_fp/vs2013-optimization.patch @@ -0,0 +1,18 @@ +Index: base/third_party/dmg_fp/dtoa.cc +diff --git a/base/third_party/dmg_fp/dtoa.cc b/base/third_party/dmg_fp/dtoa.cc +index 4eb9f0efd94221b3ab95f84554bbc92f112bf973..b03ccff569f9403eb67a95737b0e19740e56ef33 100644 +--- a/base/third_party/dmg_fp/dtoa.cc ++++ b/base/third_party/dmg_fp/dtoa.cc +@@ -179,6 +179,12 @@ + * used for input more than STRTOD_DIGLIM digits long (default 40). + */ + ++#if defined _MSC_VER && _MSC_VER == 1800 ++// TODO(scottmg): VS2013 RC ICEs on a bunch of functions in this file. ++// This should be removed after RTM. See http://crbug.com/288948. ++#pragma optimize("", off) ++#endif ++ + #define IEEE_8087 + #define NO_HEX_FP + |