DescriptionRevert of Allocator shims working on VS2015. (patchset #11 id:200001 of https://codereview.chromium.org/1414453017/ )
Reason for revert:
It breaks the link on Windows.
FAILED: C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x86 True views_examples_with_content_exe.exe "C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x86 False link.exe /nologo /OUT:views_examples_with_content_exe.exe @views_examples_with_content_exe.exe.rsp" 1 mt.exe rc.exe "obj\ui\views\examples\views_examples_with_content_exe.views_examples_with_content_exe.exe.intermediate.manifest" obj\ui\views\examples\views_examples_with_content_exe.views_examples_with_content_exe.exe.generated.manifest ..\..\ui\views\examples\views_examples.exe.manifest ..\..\build\win\compatibility.manifest
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: __query_new_mode already defined in libucrt.lib(new_mode.obj)
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: __set_new_mode already defined in libucrt.lib(new_mode.obj)
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _calloc already defined in libucrt.lib(calloc.obj)
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _free already defined in libucrt.lib(free.obj)
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _malloc already defined in libucrt.lib(malloc.obj)
allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _realloc already defined in libucrt.lib(realloc.obj)
views_examples_with_content_exe.exe : fatal error LNK1169: one or more multiply defined symbols found
Original issue's description:
> Allocator shims working on VS2015.
>
> VS2015 is happy for us to simply override the CRT symbols since they
> seem to be defined weakly by the universal CRT.
>
> This shim is far simpler than the previous one, as the libcmt stripping
> technique can be removed.
>
> Allocator shim is also now only be enabled on Release Static builds.
>
> BUG=481611
> TEST=base_unittests --gtest_filter=*Memory* in all configurations
> (Debug/Release/Static/Component/GN/gyp/x64/x86)
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
>
> Committed: https://crrev.com/e20c2e0ab4e5b796e7a1890fb9048b5eb307d015
> Cr-Commit-Position: refs/heads/master@{#383810}
TBR=thakis@chromium.org,brucedawson@chromium.org,rnk@chromium.org,piman@chromium.org,primiano@chromium.org,wfh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=481611
Committed: https://crrev.com/8da3c07046e9c0df8773771f816f017638418f1b
Cr-Commit-Position: refs/heads/master@{#383851}
Patch Set 1 #
Messages
Total messages: 7 (2 generated)
|