[src/trunk]: src/crypto/external/bsd/openssl/lib add missing assembly stub ma...

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

details:   https://anonhg.NetBSD.org/src/rev/6cc2dc6a7552
branches:  trunk
changeset: 375867:6cc2dc6a7552
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 17 19:09:41 2023 +0000

description:
add missing assembly stub macro, remove WARNS=0

diffstat:

 crypto/external/bsd/openssl/lib/libapps/Makefile                |  4 +---
 crypto/external/bsd/openssl/lib/libcommon/Makefile              |  4 +---
 crypto/external/bsd/openssl/lib/libcrypto/Makefile              |  6 +++---
 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc   |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc       |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc      |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc   |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc     |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc   |  1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc    |  1 +
 crypto/external/bsd/openssl/lib/libdefault/Makefile             |  4 +---
 crypto/external/bsd/openssl/lib/liblegacy/Makefile              |  4 +---
 crypto/external/bsd/openssl/lib/libssl/Makefile                 |  4 +---
 14 files changed, 16 insertions(+), 18 deletions(-)

diffs (193 lines):

diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libapps/Makefile
--- a/crypto/external/bsd/openssl/lib/libapps/Makefile  Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libapps/Makefile  Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS=     no
 .include <bsd.own.mk>
 .include <bsd.shlib.mk>
 
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcommon/Makefile
--- a/crypto/external/bsd/openssl/lib/libcommon/Makefile        Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcommon/Makefile        Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2023/05/16 19:06:09 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS=     no
 .include <bsd.own.mk>
 .include <bsd.shlib.mk>
 
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $
+#      $NetBSD: Makefile,v 1.28 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,8 @@ USE_FIPS=     no
 .include <bsd.own.mk>
 .include <bsd.shlib.mk>
 
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
+COPTS+= -Wno-error=cast-qual -Wno-error=discarded-qualifiers
+COPTS+= -Wno-error=missing-field-initializers -Wno-error=char-subscripts
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc     Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc     Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,5 @@
 .PATH.S: ${.PARSEDIR}
+ECCPPFLAGS+=-DECP_NISTZ256_ASM
 EC_SRCS += ecp_nistz256-armv8.S
 ECNI = yes
 .include "../../ec.inc"
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Wed May 17 19:09:41 2023 +0000
@@ -2,6 +2,7 @@
 
 .if ${ARM_MAX_ARCH} >= 4
 EC_SRCS += ecp_nistz256-armv4.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 ECNI = yes
 .endif
 ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc        Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc        Wed May 17 19:09:41 2023 +0000
@@ -3,6 +3,7 @@ EC_SRCS += \
 ecp_nistz256-x86.S 
 
 ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 
 ECNI = yes
 .include "../../ec.inc"
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc     Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc     Wed May 17 19:09:41 2023 +0000
@@ -1,3 +1,4 @@
 ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+#ECCPPFLAGS+=-DECP_NISTZ256_ASM
 
 .include "../../ec.inc"
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc   Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc   Wed May 17 19:09:41 2023 +0000
@@ -5,6 +5,7 @@ ecp_nistp521-ppc64.S \
 ecp_ppc.c \
 x25519-ppc64.S 
 
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 ECCPPFLAGS+= -DX25519_ASM
 ECNI=yes
 
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc       Wed May 17 19:09:41 2023 +0000
@@ -3,6 +3,7 @@
 EC_SRCS += \
        ecp_nistz256-sparcv9.S
 
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 ECNI = yes
 AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
 .else
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc     Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc     Wed May 17 19:09:41 2023 +0000
@@ -1,6 +1,7 @@
 .PATH.S: ${.PARSEDIR}
 EC_SRCS += \
 ecp_nistz256-sparcv9.S 
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 
 ECNI = yes
 .include "../../ec.inc"
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc      Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc      Wed May 17 19:09:41 2023 +0000
@@ -3,6 +3,7 @@ EC_SRCS += \
 ecp_nistz256-x86_64.S \
 x25519-x86_64.S 
 
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
 ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
 
 ECNI = yes
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libdefault/Makefile
--- a/crypto/external/bsd/openssl/lib/libdefault/Makefile       Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libdefault/Makefile       Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2023/05/09 19:22:07 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS=     no
 .include <bsd.own.mk>
 .include <bsd.shlib.mk>
 
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/liblegacy/Makefile
--- a/crypto/external/bsd/openssl/lib/liblegacy/Makefile        Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/liblegacy/Makefile        Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2023/05/16 19:06:09 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FORT?= yes        # cryptographic software
 .include <bsd.own.mk>
 .include <bsd.shlib.mk>
 
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
 CWARNFLAGS.clang+=     -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment
diff -r 4d3d5a3e33ae -r 6cc2dc6a7552 crypto/external/bsd/openssl/lib/libssl/Makefile
--- a/crypto/external/bsd/openssl/lib/libssl/Makefile   Wed May 17 18:20:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libssl/Makefile   Wed May 17 19:09:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2023/05/09 19:22:07 christos Exp $
+#      $NetBSD: Makefile,v 1.14 2023/05/17 19:09:42 christos Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -20,8 +20,6 @@
 
 USE_FORT?=yes  # cryptographic software and network library
 
-# XXX There's a bit of work to do before we can enable warnings.
-WARNS=0
 CWARNFLAGS.clang+=     -Wno-unused-value
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=     -Wno-atomic-alignment