[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto Define OPENSSL_CPU...

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

details:   https://anonhg.NetBSD.org/src/rev/db9260ac845d
branches:  trunk
changeset: 932497:db9260ac845d
user:      nia <nia%NetBSD.org@localhost>
date:      Sat May 09 13:16:41 2020 +0000

description:
Define OPENSSL_CPUID_OBJ in general CPPFLAGS instead of CRYPTOCPPFLAGS

This is used in various parts of the distribution, defining it here
avoids future problems with CPU-specific features not being detected.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc   |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc     |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc       |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc      |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc   |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc     |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc   |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc       |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc    |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/crypto.inc                |  3 +--
 crypto/external/bsd/openssl/lib/libcrypto/evp.inc                   |  3 +--
 12 files changed, 12 insertions(+), 14 deletions(-)

diffs (145 lines):

diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Sat May 09 13:16:41 2020 +0000
@@ -1,9 +1,9 @@
 .PATH.S: ${.PARSEDIR}
 CPUID_SRCS += arm64cpuid.S armcap.c
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 ARM_MAX_ARCH=8
 CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 CFLAGS+= ${${ACTIVE_CC} == "clang" :? -no-integrated-as :}
 .include "../../crypto.inc"
 
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc   Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc   Sat May 09 13:16:41 2020 +0000
@@ -5,7 +5,7 @@
 CPUID_SRCS += alpha-mont.S alphacpuid.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -I${ASMDIR}
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"
 
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc     Sat May 09 13:16:41 2020 +0000
@@ -3,7 +3,7 @@
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"
 
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc    Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc    Sat May 09 13:16:41 2020 +0000
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 CPUID_SRCS = x86cpuid.S
 CPUID = yes
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Sat May 09 13:16:41 2020 +0000
@@ -1,4 +1,4 @@
 CPUID_SRCS = ppccap.c ppccpuid.S
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc       Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc       Sat May 09 13:16:41 2020 +0000
@@ -1,4 +1,4 @@
 CPUID_SRCS = ppccap.c ppccpuid.S
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc   Sat May 09 13:16:41 2020 +0000
@@ -2,7 +2,7 @@
 .PATH.c: ${.PARSEDIR}
 CPUID = yes
 CPUID_SRCS += sparccpuid.S sparccap.c
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .if ${MACHINE} == "sparc64"
 CPUID_SRCS += sparcv9-mont.S sparcv9a-mont.S 
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sat May 09 13:16:41 2020 +0000
@@ -1,7 +1,7 @@
 .PATH.S: ${.PARSEDIR}
 CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S 
 CPUID_SRCS += sparct4-mont.S vis3-mont.S
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 #CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Sat May 09 13:16:41 2020 +0000
@@ -1,6 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
 #CRYPTO_SRCS += libc-memequal.c
-#CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+#CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc  Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc  Sat May 09 13:16:41 2020 +0000
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 CPUID_SRCS = x86_64cpuid.S
 CPUID = yes    
-CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
+CPPFLAGS += -DOPENSSL_CPUID_OBJ
 .include "../../crypto.inc"
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc      Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc      Sat May 09 13:16:41 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: crypto.inc,v 1.9 2018/12/08 22:35:44 christos Exp $
+#      $NetBSD: crypto.inc,v 1.10 2020/05/09 13:16:41 nia Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -37,7 +37,6 @@
 CRYPTO_SRCS+=  mem_clr.c
 .else
 CRYPTO_SRCS+=  ${CPUID_SRCS}
-#CRYPTOCPPFLAGS=-DOPENSSL_CPUID_OBJ
 .endif
 
 CRYPTOCPPFLAGS+=-DOPENSSL_NO_STATIC_ENGINE
diff -r 612a289e9c6c -r db9260ac845d crypto/external/bsd/openssl/lib/libcrypto/evp.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Sat May 09 12:20:50 2020 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Sat May 09 13:16:41 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: evp.inc,v 1.9 2020/05/09 12:20:50 nia Exp $
+#      $NetBSD: evp.inc,v 1.10 2020/05/09 13:16:41 nia Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -85,7 +85,6 @@
 
 .for cryptosrc in ${EVP_AES_SRCS}
 CPPFLAGS.${cryptosrc} += ${AESCPPFLAGS}
-CPPFLAGS.${cryptosrc} += ${CRYPTOCPPFLAGS}
 .endfor
 
 CPPFLAGS.e_aes.c += -I${OPENSSLSRC}/crypto/modes