Module Name: src Committed By: nia Date: Sat May 9 13:16:43 UTC 2020
Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: crypto.inc evp.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: crypto.inc Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc \ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.9 Sat Dec 8 22:35:44 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc Sat May 9 13:16:41 2020 @@ -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 @@ SRCS += ${CRYPTO_SRCS} CRYPTO_SRCS+= mem_clr.c .else CRYPTO_SRCS+= ${CPUID_SRCS} -#CRYPTOCPPFLAGS=-DOPENSSL_CPUID_OBJ .endif CRYPTOCPPFLAGS+=-DOPENSSL_NO_STATIC_ENGINE Index: src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.9 Sat May 9 12:20:50 2020 +++ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Sat May 9 13:16:41 2020 @@ -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 @@ EVP_AES_SRCS = e_aes.c .for cryptosrc in ${EVP_AES_SRCS} CPPFLAGS.${cryptosrc} += ${AESCPPFLAGS} -CPPFLAGS.${cryptosrc} += ${CRYPTOCPPFLAGS} .endfor CPPFLAGS.e_aes.c += -I${OPENSSLSRC}/crypto/modes Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.5 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.4 Mon Sep 24 11:03:39 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Sat May 9 13:16:42 2020 @@ -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" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.3 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.2 Mon Sep 24 11:03:39 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc Sat May 9 13:16:42 2020 @@ -5,7 +5,7 @@ ASMDIR:=${.PARSEDIR} 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" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.10 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.11 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.10 Sun Sep 23 21:44:01 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Sat May 9 13:16:42 2020 @@ -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" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.3 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.2 Sun Sep 23 13:33:04 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc Sat May 9 13:16:42 2020 @@ -1,5 +1,5 @@ .PATH.S: ${.PARSEDIR} CPUID_SRCS = x86cpuid.S CPUID = yes -CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ +CPPFLAGS += -DOPENSSL_CPUID_OBJ .include "../../crypto.inc" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.4 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.3 Mon Sep 24 11:03:40 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Sat May 9 13:16:42 2020 @@ -1,4 +1,4 @@ CPUID_SRCS = ppccap.c ppccpuid.S -CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ +CPPFLAGS += -DOPENSSL_CPUID_OBJ CPUID = yes .include "../../crypto.inc" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.3 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.2 Mon Sep 24 11:03:40 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc Sat May 9 13:16:42 2020 @@ -1,4 +1,4 @@ CPUID_SRCS = ppccap.c ppccpuid.S -CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ +CPPFLAGS += -DOPENSSL_CPUID_OBJ CPUID = yes .include "../../crypto.inc" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.12 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.11 Mon Sep 24 20:36:51 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc Sat May 9 13:16:42 2020 @@ -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 Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.8 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.7 Mon Sep 24 00:45:12 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc Sat May 9 13:16:42 2020 @@ -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" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.4 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.3 Tue Sep 25 14:17:49 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc Sat May 9 13:16:42 2020 @@ -1,6 +1,6 @@ .PATH.S: ${.PARSEDIR} #CRYPTO_SRCS += libc-memequal.c -#CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ +#CPPFLAGS += -DOPENSSL_CPUID_OBJ .include "../../crypto.inc" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.3 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc:1.2 Sun Sep 23 13:33:05 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc Sat May 9 13:16:43 2020 @@ -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"