summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornjsmith <njs@pobox.com>2013-01-10 14:28:02 -0800
committernjsmith <njs@pobox.com>2013-01-10 14:28:02 -0800
commit00a8c0ca278280d04d32fc84386c29800e3b5a00 (patch)
tree48587e12da686acbb526c8e5ee9316177be1913f
parent849a8c5f9db1087def26e63393ec48497cee8dd4 (diff)
parent7d7a5939dcf5821d9f381d57bfa2012568ef6b82 (diff)
downloadnumpy-00a8c0ca278280d04d32fc84386c29800e3b5a00.tar.gz
Merge pull request #2901 from hrw/master
Add support for AArch64 architecture
-rw-r--r--numpy/core/include/numpy/npy_cpu.h2
-rw-r--r--numpy/core/include/numpy/npy_endian.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
index 8a2978806..9707a7adf 100644
--- 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
index aa5ed8b2b..4e3349ffe 100644
--- 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