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/allocator | |
| 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/allocator')
| -rwxr-xr-x | base/allocator/prep_libc.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/base/allocator/prep_libc.py b/base/allocator/prep_libc.py index e13e9e3..ba25cea0 100755 --- a/base/allocator/prep_libc.py +++ b/base/allocator/prep_libc.py @@ -4,7 +4,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # -# This script takes libcmt.lib for VS2005/08/10 and removes the allocation +# This script takes libcmt.lib for VS2005/08/10/12/13 and removes the allocation # related functions from it. # # Usage: prep_libc.py <VCLibDir> <OutputDir> <arch> @@ -51,7 +51,10 @@ def main(): 'F:\\dd\\vctools\\crt_bld\\' + bindir + \ '\\crt\\src\\build\\' + objdir + '\\mt_obj\\nativec\\\\', 'F:\\dd\\vctools\\crt_bld\\' + bindir + \ - '\\crt\\src\\build\\' + objdir + '\\mt_obj\\nativecpp\\\\' ] + '\\crt\\src\\build\\' + objdir + '\\mt_obj\\nativecpp\\\\', + 'f:\\binaries\\Intermediate\\vctools\\crt_bld\\' + bindir + \ + '\\crt\\prebuild\\build\\INTEL\\mt_obj\\cpp_obj\\\\', + ] objfiles = ['malloc', 'free', 'realloc', 'new', 'delete', 'new2', 'delete2', 'align', 'msize', 'heapinit', 'expand', 'heapchk', 'heapwalk', |