src/include/atomic_ops.h - Issue 10913285: Switch NaCl code to use GCC intrinsics for atomic ops.

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: src/include/atomic_ops.h

Issue 10913285: Switch NaCl code to use GCC intrinsics for atomic ops. (Closed) Base URL: http://src.chromium.org/native_client/trunk/src/native_client/

Patch Set: Rename the file and correct #ifdef. Created 8 years, 3 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

Index: src/include/atomic_ops.h

diff --git a/src/include/atomic_ops.h b/src/include/atomic_ops.h

index ef8a90275a5592fdfbdef00d32614dd31ee8815b..a25fe323cc59195fecc640830fbc407c7391cd40 100644

--- a/src/include/atomic_ops.h

+++ b/src/include/atomic_ops.h

@@ -41,20 +41,10 @@

#include "native_client/src/include/nacl_base.h"

-#ifdef __native_client__

-#include "native_client/src/include/nacl/atomic_ops.h"

+#if defined(__native_client__) || NACL_LINUX

+#include "native_client/src/include/gcc/atomic_ops.h"

#elif NACL_OSX

#include "native_client/src/include/osx/atomic_ops_osx.h"

-#elif NACL_LINUX

-#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86

-#include "native_client/src/include/linux/x86/atomic_ops.h"

-#elif NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm

-#include "native_client/src/include/linux/arm/atomic_ops.h"

-#else

-#error Unknown platform!

-#endif

#elif NACL_WINDOWS

#include "native_client/src/include/win/atomic_ops_win32.h"

#else

« no previous file with comments | « no previous file | src/include/gcc/atomic_ops.h » ('j') | no next file with comments »