[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch Don't include...

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

details:   https://anonhg.NetBSD.org/src/rev/4780e72b042a
branches:  trunk
changeset: 433623:4780e72b042a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Sep 24 11:03:39 2018 +0000

description:
Don't include the libc CRYPTO_memcmp file (it has a different prototype
now) and it is provided by openssl in C, or use the assembly versions.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc   |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc     |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc      |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc      |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc      |  1 -
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc   |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc       |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc       |  1 +
 9 files changed, 8 insertions(+), 4 deletions(-)

diffs (83 lines):

diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Mon Sep 24 11:03:39 2018 +0000
@@ -1,5 +1,6 @@
 .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}
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc   Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc   Mon Sep 24 11:03:39 2018 +0000
@@ -5,6 +5,7 @@
 CPUID_SRCS += alpha-mont.S alphacpuid.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -I${ASMDIR}
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"
 
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc    Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc    Mon Sep 24 11:03:39 2018 +0000
@@ -1,3 +1,3 @@
 
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc    Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc    Mon Sep 24 11:03:39 2018 +0000
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
 
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc    Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc    Mon Sep 24 11:03:39 2018 +0000
@@ -3,6 +3,5 @@
 
 CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 .endif
-CRYPTO_SRCS += libc-memequal.c
 
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Mon Sep 24 11:03:39 2018 +0000
@@ -1,3 +1,4 @@
 CPUID_SRCS = ppccap.c ppccpuid.S
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc       Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc       Mon Sep 24 11:03:39 2018 +0000
@@ -1,3 +1,4 @@
 CPUID_SRCS = ppccap.c ppccpuid.S
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 CPUID = yes
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc     Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc     Mon Sep 24 11:03:39 2018 +0000
@@ -1,3 +1,3 @@
 
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
 .include "../../crypto.inc"
diff -r 996c6ba43276 -r 4780e72b042a crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Mon Sep 24 11:02:12 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc     Mon Sep 24 11:03:39 2018 +0000
@@ -1,5 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
 CRYPTO_SRCS += libc-memequal.c
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"