Linux: Fix undefined reference to 'AtomicOps_Internalx86CPUFeatures' (issue #1681)

This commit is contained in:
Marshall Greenblatt 2015-08-06 11:46:59 -07:00
parent 828fe45bc1
commit 2792d1bb12
2 changed files with 0 additions and 18 deletions

View File

@ -132,12 +132,6 @@ patches = [
'name': 'spellcheck_137',
'path': '../chrome/browser/spellchecker/',
},
{
# Fix multiple definition of 'AtomicOps_Internalx86CPUFeatures' on Linux.
# https://code.google.com/p/chromium/issues/detail?id=455263
'name': 'base_atomicops_455263',
'path': '../base/allocator/',
},
{
# Make URLRequest::set_is_pending() public so that it can be called from
# CefRequestInterceptor::MaybeInterceptResponse().

View File

@ -1,12 +0,0 @@
diff --git allocator.gyp allocator.gyp
index d426c9c..f593048 100644
--- allocator.gyp
+++ allocator.gyp
@@ -238,6 +238,7 @@
'<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
'<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
'<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
'<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
'<(tcmalloc_dir)/src/base/atomicops.h',
'<(tcmalloc_dir)/src/base/basictypes.h',