[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto Update arm runtime d...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/283f82d06e5d
branches:  trunk
changeset: 336686:283f82d06e5d
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Mar 10 13:28:08 2015 +0000

description:
Update arm runtime detection from version 1.0.2, so we can use the newer
asm support code.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/arm_arch.h |  99 ++++++++++++++--------
 crypto/external/bsd/openssl/dist/crypto/armcap.c   |   6 +
 2 files changed, 69 insertions(+), 36 deletions(-)

diffs (156 lines):

diff -r 339a392f531c -r 283f82d06e5d crypto/external/bsd/openssl/dist/crypto/arm_arch.h
--- a/crypto/external/bsd/openssl/dist/crypto/arm_arch.h        Tue Mar 10 13:05:13 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/arm_arch.h        Tue Mar 10 13:28:08 2015 +0000
@@ -1,51 +1,78 @@
 #ifndef __ARM_ARCH_H__
-#define __ARM_ARCH_H__
+# define __ARM_ARCH_H__
 
-#if !defined(__ARM_ARCH__)
-# if defined(__CC_ARM)
-#  define __ARM_ARCH__ __TARGET_ARCH_ARM
-#  if defined(__BIG_ENDIAN)
-#   define __ARMEB__
-#  else
-#   define __ARMEL__
-#  endif
-# elif defined(__GNUC__)
+# if !defined(__ARM_ARCH__)
+#  if defined(__CC_ARM)
+#   define __ARM_ARCH__ __TARGET_ARCH_ARM
+#   if defined(__BIG_ENDIAN)
+#    define __ARMEB__
+#   else
+#    define __ARMEL__
+#   endif
+#  elif defined(__GNUC__)
+#   if   defined(__aarch64__)
+#    define __ARM_ARCH__ 8
+#    if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__
+#     define __ARMEB__
+#    else
+#     define __ARMEL__
+#    endif
   /*
    * Why doesn't gcc define __ARM_ARCH__? Instead it defines
    * bunch of below macros. See all_architectires[] table in
    * gcc/config/arm/arm.c. On a side note it defines
    * __ARMEL__/__ARMEB__ for little-/big-endian.
    */
-#  if  defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)     || \
-       defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__)     || \
-       defined(__ARM_ARCH_7EM__)
-#   define __ARM_ARCH__ 7
-#  elif        defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__)     || \
-       defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__)     || \
-       defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)    || \
-       defined(__ARM_ARCH_6T2__)
-#   define __ARM_ARCH__ 6
-#  elif        defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
-       defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
-       defined(__ARM_ARCH_5TEJ__)
-#   define __ARM_ARCH__ 5
-#  elif        defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
-#   define __ARM_ARCH__ 4
-#  else
-#   error "unsupported ARM architecture"
+#   elif defined(__ARM_ARCH)
+#    define __ARM_ARCH__ __ARM_ARCH
+#   elif defined(__ARM_ARCH_8A__)
+#    define __ARM_ARCH__ 8
+#   elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)     || \
+        defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__)     || \
+        defined(__ARM_ARCH_7EM__)
+#    define __ARM_ARCH__ 7
+#   elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__)     || \
+        defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__)     || \
+        defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)    || \
+        defined(__ARM_ARCH_6T2__)
+#    define __ARM_ARCH__ 6
+#   elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
+        defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
+        defined(__ARM_ARCH_5TEJ__)
+#    define __ARM_ARCH__ 5
+#   elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+#    define __ARM_ARCH__ 4
+#   else
+#    error "unsupported ARM architecture"
+#   endif
 #  endif
 # endif
-#endif
 
-#ifdef OPENSSL_FIPSCANISTER
-#include <openssl/fipssyms.h>
-#endif
+# ifdef OPENSSL_FIPSCANISTER
+#  include <openssl/fipssyms.h>
+# endif
+
+# if !defined(__ARM_MAX_ARCH__)
+#  define __ARM_MAX_ARCH__ __ARM_ARCH__
+# endif
 
-#if !__ASSEMBLER__
+# if __ARM_MAX_ARCH__<__ARM_ARCH__
+#  error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"
+# elif __ARM_MAX_ARCH__!=__ARM_ARCH__
+#  if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__)
+#   error "can't build universal big-endian binary"
+#  endif
+# endif
+
+# if !__ASSEMBLER__
 extern unsigned int OPENSSL_armcap_P;
-                                     
-#define ARMV7_NEON      (1<<0)
-#define ARMV7_TICK      (1<<1)
-#endif
+# endif
+
+# define ARMV7_NEON      (1<<0)
+# define ARMV7_TICK      (1<<1)
+# define ARMV8_AES       (1<<2)
+# define ARMV8_SHA1      (1<<3)
+# define ARMV8_SHA256    (1<<4)
+# define ARMV8_PMULL     (1<<5)
 
 #endif
diff -r 339a392f531c -r 283f82d06e5d crypto/external/bsd/openssl/dist/crypto/armcap.c
--- a/crypto/external/bsd/openssl/dist/crypto/armcap.c  Tue Mar 10 13:05:13 2015 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/armcap.c  Tue Mar 10 13:28:08 2015 +0000
@@ -18,14 +18,18 @@
  * Following subroutines could have been inlined, but it's not all
  * ARM compilers support inline assembler...
  */
+#if __ARM_MAX_ARCH__>=7
 void _armv7_neon_probe(void);
 unsigned int _armv7_tick(void);
+#endif
 
 unsigned int OPENSSL_rdtsc(void)
        {
+#if __ARM_MAX_ARCH__>=7
        if (OPENSSL_armcap_P & ARMV7_TICK)
                return _armv7_tick();
        else
+#endif
                return 0;
        }
 
@@ -64,6 +68,7 @@
        sigprocmask(SIG_SETMASK,&ill_act.sa_mask,&oset);
        sigaction(SIGILL,&ill_act,&ill_oact);
 
+#if __ARM_MAX_ARCH__>=7
        if (sigsetjmp(ill_jmp,1) == 0)
                {
                _armv7_neon_probe();
@@ -74,6 +79,7 @@
                _armv7_tick();
                OPENSSL_armcap_P |= ARMV7_TICK;
                }
+#endif
 
        sigaction (SIGILL,&ill_oact,NULL);
        sigprocmask(SIG_SETMASK,&oset,NULL);