[src/trunk]: src ARMv6KZ has been misspelled by GCC since forever, but clang ...

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

details:   https://anonhg.NetBSD.org/src/rev/388d01bdbd60
branches:  trunk
changeset: 458605:388d01bdbd60
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 02 12:07:24 2019 +0000

description:
ARMv6KZ has been misspelled by GCC since forever, but clang only
provides the correct name. Support both.

diffstat:

 common/lib/libc/arch/arm/features.c                    |  4 ++--
 crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h |  2 +-
 crypto/external/bsd/openssl/dist/crypto/arm_arch.h     |  2 +-
 sys/arch/arm/include/cdefs.h                           |  5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r f55c83960c22 -r 388d01bdbd60 common/lib/libc/arch/arm/features.c
--- a/common/lib/libc/arch/arm/features.c       Fri Aug 02 12:06:20 2019 +0000
+++ b/common/lib/libc/arch/arm/features.c       Fri Aug 02 12:07:24 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: features.c,v 1.1 2014/02/27 09:37:02 matt Exp $ */
+/* $NetBSD: features.c,v 1.2 2019/08/02 12:07:24 joerg Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -48,7 +48,7 @@
 #if defined (HAVE_THUMB2) || defined (__ARM_ARCH_6__) || \
     defined (__ARM_ARCH_6J__)  || defined (__ARM_ARCH_6K__) || \
     defined (__ARM_ARCH_6Z__)  || defined (__ARM_ARCH_6ZK__) || \
-    defined (__ARM_ARCH_6ZM__)
+    defined (__ARM_ARCH_6KZ__) || defined (__ARM_ARCH_6ZM__)
 #define HAVE_LDREX
 #endif
 
diff -r f55c83960c22 -r 388d01bdbd60 crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h
--- a/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h    Fri Aug 02 12:06:20 2019 +0000
+++ b/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h    Fri Aug 02 12:07:24 2019 +0000
@@ -34,7 +34,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__)
+        defined(__ARM_ARCH_6T2__)|| defined(__ARM_ARCH_6KZ__)
 #    define __ARM_ARCH__ 6
 #   elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
         defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
diff -r f55c83960c22 -r 388d01bdbd60 crypto/external/bsd/openssl/dist/crypto/arm_arch.h
--- a/crypto/external/bsd/openssl/dist/crypto/arm_arch.h        Fri Aug 02 12:06:20 2019 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/arm_arch.h        Fri Aug 02 12:07:24 2019 +0000
@@ -43,7 +43,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__)
+        defined(__ARM_ARCH_6T2__)|| defined(__ARM_ARCH_6KZ__)
 #    define __ARM_ARCH__ 6
 #   elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
         defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
diff -r f55c83960c22 -r 388d01bdbd60 sys/arch/arm/include/cdefs.h
--- a/sys/arch/arm/include/cdefs.h      Fri Aug 02 12:06:20 2019 +0000
+++ b/sys/arch/arm/include/cdefs.h      Fri Aug 02 12:07:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cdefs.h,v 1.15 2014/06/23 03:40:57 christos Exp $      */
+/*     $NetBSD: cdefs.h,v 1.16 2019/08/02 12:07:25 joerg Exp $ */
 
 #ifndef        _ARM_CDEFS_H_
 #define        _ARM_CDEFS_H_
@@ -25,7 +25,8 @@
 #endif
 
 #if defined (_ARM_ARCH_T2) || defined (__ARM_ARCH_6__) || \
-    defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \
+    defined (__ARM_ARCH_6J__) || \
+    defined (__ARM_ARCH_6K__) || defined (__ARM_ARCH_6KZ__) || \
     defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \
     defined (__ARM_ARCH_6ZM__)
 #define _ARM_ARCH_6