Add support for KERN_ARND to get random bytes on NetBSD

[openssl.git] / crypto / armv4cpuid.pl

diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index 33c893d0e460f7e901240f68456712fbb968ecbd..ab007c19c3cd0c2caf9e16e50649cc4b76df8ae1 100644 (file)
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -27,6 +27,7 @@ $code.=<<___;
 .thumb
 #else
 .code  32
+#undef __thumb2__
 #endif
 
 .align 5
@@ -124,7 +125,7 @@ CRYPTO_memcmp:
 
        ldmia   sp!,{r4,r5}
 .Lno_data:
-       neg     r0,ip
+       rsb     r0,ip,#0
        mov     r0,r0,lsr#31
 #if __ARM_ARCH__>=5
        bx      lr