Merge remote-tracking branch 'origin/stable/11' into devel-11

22 files changed, 44 insertions, 44 deletions

diff --git a/secure/lib/libcrypto/i386/aes-586.S b/secure/lib/libcrypto/i386/aes-586.S
index 50265e4..bbf3147 100644
--- a/secure/lib/libcrypto/i386/aes-586.S
+++ b/secure/lib/libcrypto/i386/aes-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aes-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aes-586.pl. */
 #ifdef PIC
 .file	"aes-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/aesni-x86.S b/secure/lib/libcrypto/i386/aesni-x86.S
index 0badfda..26b6157 100644
--- a/secure/lib/libcrypto/i386/aesni-x86.S
+++ b/secure/lib/libcrypto/i386/aesni-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from aesni-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from aesni-x86.pl. */
 #ifdef PIC
 .file	"aesni-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bf-586.S b/secure/lib/libcrypto/i386/bf-586.S
index 8e8ab9e..6cbbb6b 100644
--- a/secure/lib/libcrypto/i386/bf-586.S
+++ b/secure/lib/libcrypto/i386/bf-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-586.pl. */
 #ifdef PIC
 .file	"bf-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bf-686.S b/secure/lib/libcrypto/i386/bf-686.S
index 7559b7b..c729e5f 100644
--- a/secure/lib/libcrypto/i386/bf-686.S
+++ b/secure/lib/libcrypto/i386/bf-686.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bf-686.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bf-686.pl. */
 #ifdef PIC
 .file	"bf-686.S"
 .text
diff --git a/secure/lib/libcrypto/i386/bn-586.S b/secure/lib/libcrypto/i386/bn-586.S
index b2de33f..1c742e9 100644
--- a/secure/lib/libcrypto/i386/bn-586.S
+++ b/secure/lib/libcrypto/i386/bn-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from bn-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from bn-586.pl. */
 #ifdef PIC
 .file	"bn-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/cmll-x86.S b/secure/lib/libcrypto/i386/cmll-x86.S
index eb05460..abb8842 100644
--- a/secure/lib/libcrypto/i386/cmll-x86.S
+++ b/secure/lib/libcrypto/i386/cmll-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from cmll-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from cmll-x86.pl. */
 #ifdef PIC
 .file	"cmll-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/co-586.S b/secure/lib/libcrypto/i386/co-586.S
index f2b331e..3623343 100644
--- a/secure/lib/libcrypto/i386/co-586.S
+++ b/secure/lib/libcrypto/i386/co-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from co-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from co-586.pl. */
 #ifdef PIC
 .file	"co-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/crypt586.S b/secure/lib/libcrypto/i386/crypt586.S
index ce021f3..0c9a706 100644
--- a/secure/lib/libcrypto/i386/crypt586.S
+++ b/secure/lib/libcrypto/i386/crypt586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from crypt586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from crypt586.pl. */
 #ifdef PIC
 .file	"crypt586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/des-586.S b/secure/lib/libcrypto/i386/des-586.S
index 137ed95..57fe540 100644
--- a/secure/lib/libcrypto/i386/des-586.S
+++ b/secure/lib/libcrypto/i386/des-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from des-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from des-586.pl. */
 #ifdef PIC
 .file	"des-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/ghash-x86.S b/secure/lib/libcrypto/i386/ghash-x86.S
index fd1e97d..8e42a83 100644
--- a/secure/lib/libcrypto/i386/ghash-x86.S
+++ b/secure/lib/libcrypto/i386/ghash-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from ghash-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from ghash-x86.pl. */
 #ifdef PIC
 .file	"ghash-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/md5-586.S b/secure/lib/libcrypto/i386/md5-586.S
index 3440021..62069dd 100644
--- a/secure/lib/libcrypto/i386/md5-586.S
+++ b/secure/lib/libcrypto/i386/md5-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from md5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from md5-586.pl. */
 #ifdef PIC
 .file	"md5-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rc4-586.S b/secure/lib/libcrypto/i386/rc4-586.S
index 68158bc..0927f80 100644
--- a/secure/lib/libcrypto/i386/rc4-586.S
+++ b/secure/lib/libcrypto/i386/rc4-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc4-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc4-586.pl. */
 #ifdef PIC
 .file	"rc4-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rc5-586.S b/secure/lib/libcrypto/i386/rc5-586.S
index f97deb8..6ec0d04 100644
--- a/secure/lib/libcrypto/i386/rc5-586.S
+++ b/secure/lib/libcrypto/i386/rc5-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rc5-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rc5-586.pl. */
 #ifdef PIC
 .file	"rc5-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/rmd-586.S b/secure/lib/libcrypto/i386/rmd-586.S
index 71e3157..4a0ef6d 100644
--- a/secure/lib/libcrypto/i386/rmd-586.S
+++ b/secure/lib/libcrypto/i386/rmd-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from rmd-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from rmd-586.pl. */
 #ifdef PIC
 .file	"rmd-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha1-586.S b/secure/lib/libcrypto/i386/sha1-586.S
index e35bbea..e36b6ad 100644
--- a/secure/lib/libcrypto/i386/sha1-586.S
+++ b/secure/lib/libcrypto/i386/sha1-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha1-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha1-586.pl. */
 #ifdef PIC
 .file	"sha1-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha256-586.S b/secure/lib/libcrypto/i386/sha256-586.S
index 36ca4f9..b188e95 100644
--- a/secure/lib/libcrypto/i386/sha256-586.S
+++ b/secure/lib/libcrypto/i386/sha256-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha256-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha256-586.pl. */
 #ifdef PIC
 .file	"sha256-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/sha512-586.S b/secure/lib/libcrypto/i386/sha512-586.S
index 67cd1b5..adba3a1 100644
--- a/secure/lib/libcrypto/i386/sha512-586.S
+++ b/secure/lib/libcrypto/i386/sha512-586.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from sha512-586.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from sha512-586.pl. */
 #ifdef PIC
 .file	"sha512-586.S"
 .text
diff --git a/secure/lib/libcrypto/i386/vpaes-x86.S b/secure/lib/libcrypto/i386/vpaes-x86.S
index 909d4db..25fe2ac 100644
--- a/secure/lib/libcrypto/i386/vpaes-x86.S
+++ b/secure/lib/libcrypto/i386/vpaes-x86.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from vpaes-x86.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from vpaes-x86.pl. */
 #ifdef PIC
 .file	"vpaes-x86.S"
 .text
diff --git a/secure/lib/libcrypto/i386/wp-mmx.S b/secure/lib/libcrypto/i386/wp-mmx.S
index c02850a..85f73e9 100644
--- a/secure/lib/libcrypto/i386/wp-mmx.S
+++ b/secure/lib/libcrypto/i386/wp-mmx.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from wp-mmx.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from wp-mmx.pl. */
 #ifdef PIC
 .file	"wp-mmx.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86-gf2m.S b/secure/lib/libcrypto/i386/x86-gf2m.S
index bab2545..4ee3be2 100644
--- a/secure/lib/libcrypto/i386/x86-gf2m.S
+++ b/secure/lib/libcrypto/i386/x86-gf2m.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-gf2m.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-gf2m.pl. */
 #ifdef PIC
 .file	"x86-gf2m.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86-mont.S b/secure/lib/libcrypto/i386/x86-mont.S
index 67431fb..0988d8f 100644
--- a/secure/lib/libcrypto/i386/x86-mont.S
+++ b/secure/lib/libcrypto/i386/x86-mont.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86-mont.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86-mont.pl. */
 #ifdef PIC
 .file	"x86-mont.S"
 .text
diff --git a/secure/lib/libcrypto/i386/x86cpuid.S b/secure/lib/libcrypto/i386/x86cpuid.S
index 2023886..738f30c 100644
--- a/secure/lib/libcrypto/i386/x86cpuid.S
+++ b/secure/lib/libcrypto/i386/x86cpuid.S
@@ -1,5 +1,5 @@
-# $FreeBSD$
-# Do not modify. This file is auto-generated from x86cpuid.pl.
+/* $FreeBSD$ */
+/* Do not modify. This file is auto-generated from x86cpuid.pl. */
 #ifdef PIC
 .file	"x86cpuid.S"
 .text