Introduce OS_NACL_SFI and OS_NACL_NONSFI macros.

build/build_config.h

Index: build/build_config.h
diff --git a/build/build_config.h b/build/build_config.h
index 553484605a857baa66d252ba5df4286ce89b53c7..798dcdc8a2967e45d96d472f8b1ae93fb29e047e 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,16 @@
 #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.
+// See the following document about SFI for more details.
+// https://developer.chrome.com/native-client/reference/sandbox_internals/x86-64-sandbox

[Mark Seaborn, 2014/10/27 15:53:59]

This link isn't very relevant since it doesn't explain the difference between
SFI and Non-SFI.  I'd just leave it out (and the sentence before).

[hidehiko, 2014/10/28 08:07:21]

Done.

+// 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__)