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> |