diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-17 23:14:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-17 23:14:12 +0000 |
| commit | e078c5e5f609e3441212c6b00e038fc014cc6daa (patch) | |
| tree | d60300a99b2a299c6a078c815ccbba8d9c35b389 | |
| parent | 820e63e1e69b493368ccb083af7362f372c49ee4 (diff) | |
| parent | 540c0274bedb28050223c305f9a5499b06df328e (diff) | |
| download | scrypt-e078c5e5f609e3441212c6b00e038fc014cc6daa.tar.gz | |
Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c am: 3608597959
am: 540c0274be
* commit '540c0274bedb28050223c305f9a5499b06df328e':
scrypt doesn't need <machine/cpu-features.h>.
Change-Id: I6242ca18c85c3cd98b9f4a558d54f934c6c5409b
| -rw-r--r-- | lib/crypto/crypto_scrypt-neon.c | 1 | ||||
| -rw-r--r-- | patches/arm-neon.patch | 3 |
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> |