summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbig biff <bigbiff@teamw.in>2018-05-13 16:57:33 +0200
committerGerrit Code Review <gerrit2@gerrit.omnirom.org>2018-05-13 16:57:33 +0200
commite4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10 (patch)
treef97fad08cadc58d357993d6ac87e58b9d83c27ee
parentMerge "scrypt: Don't hardcode gtest path." into android-8.1 (diff)
parentscrypt doesn't need <machine/cpu-features.h>. (diff)
downloadandroid_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar.gz
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar.bz2
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar.lz
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar.xz
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.tar.zst
android_bootable_recovery-e4bdc280492b6f5d02a7b99e16ee1ff7ccf5ef10.zip
-rw-r--r--crypto/scrypt/lib/crypto/crypto_scrypt-neon.c1
-rw-r--r--crypto/scrypt/patches/arm-neon.patch3
2 files changed, 1 insertions, 3 deletions
diff --git a/crypto/scrypt/lib/crypto/crypto_scrypt-neon.c b/crypto/scrypt/lib/crypto/crypto_scrypt-neon.c
index a3bf052b4..d05ee1bfe 100644
--- a/crypto/scrypt/lib/crypto/crypto_scrypt-neon.c
+++ b/crypto/scrypt/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/crypto/scrypt/patches/arm-neon.patch b/crypto/scrypt/patches/arm-neon.patch
index 7197f9968..02ff357be 100644
--- a/crypto/scrypt/patches/arm-neon.patch
+++ b/crypto/scrypt/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>