Module Name: src
Committed By: joerg
Date: Fri Aug 2 12:07:25 UTC 2019
Modified Files:
src/common/lib/libc/arch/arm: features.c
src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h
src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h
src/sys/arch/arm/include: cdefs.h
Log Message:
ARMv6KZ has been misspelled by GCC since forever, but clang only
provides the correct name. Support both.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/features.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/features.c
diff -u src/common/lib/libc/arch/arm/features.c:1.1 src/common/lib/libc/arch/arm/features.c:1.2
--- src/common/lib/libc/arch/arm/features.c:1.1 Thu Feb 27 09:37:02 2014
+++ src/common/lib/libc/arch/arm/features.c Fri Aug 2 12:07:24 2019
@@ -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
Index: src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.1.1.1 src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.2
--- src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.1.1.1 Sat Feb 3 22:43:41 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h Fri Aug 2 12:07:25 2019
@@ -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__) || \
Index: src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.6 src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.7
--- src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h:1.6 Sun Sep 23 13:32:55 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h Fri Aug 2 12:07:25 2019
@@ -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__) || \
Index: src/sys/arch/arm/include/cdefs.h
diff -u src/sys/arch/arm/include/cdefs.h:1.15 src/sys/arch/arm/include/cdefs.h:1.16
--- src/sys/arch/arm/include/cdefs.h:1.15 Mon Jun 23 03:40:57 2014
+++ src/sys/arch/arm/include/cdefs.h Fri Aug 2 12:07:25 2019
@@ -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
