build/build_config.h - Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros.

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: build/build_config.h

Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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:

Index: build/build_config.h

diff --git a/build/build_config.h b/build/build_config.h

index 553484605a857baa66d252ba5df4286ce89b53c7..b07660db412f654fae64e622a26f0cc02c7fbd27 100644

--- a/build/build_config.h

+++ b/build/build_config.h

@@ -4,7 +4,8 @@

// This file adds defines about the platform we're currently building on.

// Operating System:

-// OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) / OS_NACL

+// OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) /

+// OS_NACL (NACL_SFI or NACL_NONSFI) / OS_NACL_SFI / OS_NACL_NONSFI

// Compiler:

// COMPILER_MSVC / COMPILER_GCC

// Processor:

@@ -18,6 +19,14 @@

#if defined(__native_client__)

// __native_client__ must be first, so that other OS_ defines are not set.

#define OS_NACL 1

+// OS_NACL comes in two sandboxing technology flavors, SFI or Non-SFI.

+// PNaCl toolchain defines __native_client_nonsfi__ macro in Non-SFI build

+// mode, while it does not in SFI build mode.

+#if defined(__native_client_nonsfi__)

+#define OS_NACL_NONSFI

+#else

+#define OS_NACL_SFI

+#endif

#elif defined(ANDROID)

#define OS_ANDROID 1

#elif defined(__APPLE__)

« no previous file with comments | « PRESUBMIT.py ('k') | ipc/ipc_channel.h » ('j') | no next file with comments »