third_party/tcmalloc/chromium/src/base/atomicops.h - Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/base/atomicops.h

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/tcmalloc/chromium/src/base/arm_instruction_set_select.h ('k') | third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-gcc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/base/atomicops.h

===================================================================

--- third_party/tcmalloc/chromium/src/base/atomicops.h (revision 88335)

+++ third_party/tcmalloc/chromium/src/base/atomicops.h (working copy)

@@ -86,14 +86,18 @@

// TODO(csilvers): figure out ARCH_PIII/ARCH_K8 (perhaps via ./configure?)

// ------------------------------------------------------------------------

+#include "base/arm_instruction_set_select.h"

// TODO(csilvers): match piii, not just __i386. Also, match k8

#if defined(__MACH__) && defined(__APPLE__)

#include "base/atomicops-internals-macosx.h"

-#elif defined(_MSC_VER) && defined(_M_IX86)

-#include "base/atomicops-internals-x86-msvc.h"

-#elif defined(__MINGW32__) && defined(__i386__)

-#include "base/atomicops-internals-x86-msvc.h"

-#elif defined(__GNUC__) && (defined(__i386) || defined(ARCH_K8))

+#elif defined(__GNUC__) && defined(ARMV6)

+#include "base/atomicops-internals-arm-v6plus.h"

+#elif defined(ARMV3)

+#include "base/atomicops-internals-arm-generic.h"

+#elif defined(_WIN32)

+#include "base/atomicops-internals-windows.h"

+#elif defined(__GNUC__) && (defined(__i386) || defined(__x86_64__))

#include "base/atomicops-internals-x86.h"

#elif defined(__linux__) && defined(__PPC__)

#include "base/atomicops-internals-linuxppc.h"