[src/trunk]: src fix duplicated chunk from merge

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

details:   https://anonhg.NetBSD.org/src/rev/600d17315382
branches:  trunk
changeset: 838654:600d17315382
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jan 27 04:21:26 2019 +0000

description:
fix duplicated chunk from merge

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 |  10 +---------
 distrib/amd64/ramdisks/common/Makefile.ramdisk                  |   4 +---
 external/bsd/byacc/dist/defs.h                                  |   4 +---
 external/bsd/ntp/dist/sntp/crypto.c                             |  10 +---------
 4 files changed, 4 insertions(+), 24 deletions(-)

diffs (63 lines):

diff -r 624fd3084be4 -r 600d17315382 crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3   Sun Jan 27 04:17:39 2019 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3   Sun Jan 27 04:21:26 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: OPENSSL_ia32cap.3,v 1.19 2019/01/27 02:08:33 pgoyette Exp $
+.\"    $NetBSD: OPENSSL_ia32cap.3,v 1.20 2019/01/27 04:21:26 dholland Exp $
 .\"
 .\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
 .\"
@@ -279,14 +279,6 @@
 \&   #!/bin/sh
 \&   exec clang \-no\-integrated\-as "$@"
 .Ve
-.SH "NOTES"
-.IX Header "NOTES"
-Even though \s-1AVX512\s0 support was implemented in llvm 3.6, compilation of
-assembly modules apparently requires explicit \-march flag. But then
-compiler generates processor-specific code, which in turn contradicts
-the mere idea of run-time switch execution facilitated by the variable
-in question. Till the limitation is lifted, it's possible to work around
-the problem by making build procedure use following script:
 .PP
 instead of real clang. In which case it doesn't matter which clang
 version is used, as it is \s-1GNU\s0 assembler version that will be checked.
diff -r 624fd3084be4 -r 600d17315382 distrib/amd64/ramdisks/common/Makefile.ramdisk
--- a/distrib/amd64/ramdisks/common/Makefile.ramdisk    Sun Jan 27 04:17:39 2019 +0000
+++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk    Sun Jan 27 04:21:26 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile.ramdisk,v 1.13 2019/01/27 02:08:33 pgoyette Exp $
-
-NOSANITIZER=   # defined
+#      $NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $
 
 NOSANITIZER=   # defined
 
diff -r 624fd3084be4 -r 600d17315382 external/bsd/byacc/dist/defs.h
--- a/external/bsd/byacc/dist/defs.h    Sun Jan 27 04:17:39 2019 +0000
+++ b/external/bsd/byacc/dist/defs.h    Sun Jan 27 04:21:26 2019 +0000
@@ -1,6 +1,4 @@
-/*     $NetBSD: defs.h,v 1.14 2019/01/27 02:08:33 pgoyette Exp $       */
-
-/* Id: defs.h,v 1.60 2017/12/04 17:50:02 erik.b.andersen Exp  */
+/*     $NetBSD: defs.h,v 1.15 2019/01/27 04:25:37 dholland Exp $       */
 
 /* Id: defs.h,v 1.60 2017/12/04 17:50:02 erik.b.andersen Exp  */
 
diff -r 624fd3084be4 -r 600d17315382 external/bsd/ntp/dist/sntp/crypto.c
--- a/external/bsd/ntp/dist/sntp/crypto.c       Sun Jan 27 04:17:39 2019 +0000
+++ b/external/bsd/ntp/dist/sntp/crypto.c       Sun Jan 27 04:21:26 2019 +0000
@@ -1,12 +1,4 @@
-/*     $NetBSD: crypto.c,v 1.16 2019/01/27 02:08:34 pgoyette Exp $     */
-
-/*
- * HMS: we need to test:
- * - OpenSSL versions, if we are building with them
- * - our versions
- *
- * We may need to test with(out) OPENSSL separately.
- */
+/*     $NetBSD: crypto.c,v 1.17 2019/01/27 04:28:18 dholland Exp $     */
 
 /*
  * HMS: we need to test: