Merge pull request #2911 from certik/backport2901

certik · certik · commit 788d4bc51d93 · 2013-01-16T09:49:20.000-08:00
Backport 2901
diff --git a/doc/release/1.7.0-notes.rst b/doc/release/1.7.0-notes.rst
@@ -154,6 +154,11 @@ New argument to searchsorted
 The function searchsorted now accepts a 'sorter' argument that is a
 permutation array that sorts the array to search.
 
+Build system
+------------
+
+Added experimental support for the AArch64 architecture.
+
 C API
 -----
 
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
@@ -66,6 +66,8 @@
     #define NPY_CPU_MIPSEL
 #elif defined(__MIPSEB__)
     #define NPY_CPU_MIPSEB
+#elif defined(__aarch64__)
+    #define NPY_CPU_AARCH64
 #else
     #error Unknown CPU, please report this to numpy maintainers with \
     information about your platform (OS, CPU and compiler)
diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
@@ -25,6 +25,7 @@
             || defined(NPY_CPU_IA64)    \
             || defined(NPY_CPU_ALPHA)   \
             || defined(NPY_CPU_ARMEL)   \
+            || defined(NPY_CPU_AARCH64) \
             || defined(NPY_CPU_SH_LE)   \
             || defined(NPY_CPU_MIPSEL)
         #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
