summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-05-17 12:52:12 -0700
committerElliott Hughes <enh@google.com>2016-05-17 12:52:12 -0700
commitcca9bc0e2b42c7351bf7fa4e37d8df1940393972 (patch)
treed60300a99b2a299c6a078c815ccbba8d9c35b389
parent820e63e1e69b493368ccb083af7362f372c49ee4 (diff)
downloadscrypt-cca9bc0e2b42c7351bf7fa4e37d8df1940393972.tar.gz
scrypt doesn't need <machine/cpu-features.h>.
Bug: http://b/18556103 Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
-rw-r--r--lib/crypto/crypto_scrypt-neon.c1
-rw-r--r--patches/arm-neon.patch3
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/crypto/crypto_scrypt-neon.c b/lib/crypto/crypto_scrypt-neon.c
index a3bf052..d05ee1b 100644
--- a/lib/crypto/crypto_scrypt-neon.c
+++ b/lib/crypto/crypto_scrypt-neon.c
@@ -28,7 +28,6 @@
*/
#include "scrypt_platform.h"
-#include <machine/cpu-features.h>
#include <arm_neon.h>
#include <errno.h>
diff --git a/patches/arm-neon.patch b/patches/arm-neon.patch
index 7197f99..02ff357 100644
--- a/patches/arm-neon.patch
+++ b/patches/arm-neon.patch
@@ -129,7 +129,7 @@ new file mode 100644
index 0000000..a3bf052
--- /dev/null
+++ b/lib/crypto/crypto_scrypt-neon.c
-@@ -0,0 +1,305 @@
+@@ -0,0 +1,304 @@
+/*-
+ * Copyright 2009 Colin Percival
+ * All rights reserved.
@@ -160,7 +160,6 @@ index 0000000..a3bf052
+ */
+#include "scrypt_platform.h"
+
-+#include <machine/cpu-features.h>
+#include <arm_neon.h>
+
+#include <errno.h>