Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Unified Diff: native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc

Issue 1245663004: [NaCl SDK] Re-land "Added support for NaCl IO to use the IRT Extension API." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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: native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
index da9feea96d1b516932a3019506d2340e28260025..6e9ef19824cded7c6367b8cdf8398fa1ee292c47 100644
--- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc
@@ -3,14 +3,10 @@
// found in the LICENSE file.
#include <sys/types.h> // Include something that will define __GLIBC__.
+#include "nacl_io/kernel_wrap.h" // IRT_EXT is turned on in this header.
-// The entire file is wrapped in this #if. We do this so this .cc file can be
-// compiled, even on a non-glibc build.
-// The ARM glibc toolchain uses a different IRT hooks mechanism and is not
-// yet supported by nacl_io.
-#if defined(__native_client__) && defined(__GLIBC__) && !defined(__arm__)
-
-#include "nacl_io/kernel_wrap.h"
+#if !defined(NACL_IO_IRT_EXT) && defined(__native_client__) && \
+ defined(__GLIBC__)
#include <alloca.h>
#include <assert.h>

Powered by Google App Engine
This is Rietveld 408576698