use C's style comments to compile in old MacOSX systems. Reported by Ryan Schmidt.

diff --git a/cfg.mk b/cfg.mk
index 449e35faa69241afb9e551a0ed64de1d8c664270..e613e4027bd7f0431c017d1f8da23510178d2056 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -262,29 +262,43 @@ lib/accelerated/x86/coff/cpuid-x86-coff.s: devel/perlasm/cpuid-x86.pl
        perl $< coff >> $@
 
 lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s: devel/perlasm/ghash-x86_64.pl
-       cat devel/perlasm/license.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s: devel/perlasm/aesni-x86_64.pl
-       cat devel/perlasm/license.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/appro-aes-x86-macosx.s: devel/perlasm/aesni-x86.pl
-       cat devel/perlasm/license.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/padlock-x86-64-macosx.s: devel/perlasm/e_padlock-x86_64.pl
-       cat devel/perlasm/license.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/padlock-x86-macosx.s: devel/perlasm/e_padlock-x86.pl
-       cat devel/perlasm/license.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s: devel/perlasm/cpuid-x86_64.pl
-       cat devel/perlasm/license-gnutls.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@
 
 lib/accelerated/x86/macosx/cpuid-x86-macosx.s: devel/perlasm/cpuid-x86.pl
-       cat devel/perlasm/license-gnutls.txt > $@
+       echo '/*' > $@
+       cat devel/perlasm/license.txt >> $@
+       echo '*/' >> $@
        perl $< macosx >> $@

diff --git a/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s b/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s
index 8a966e2ab59bdbc5f940241426b7991038fe28fe..cfac7050427458e1bcda4db9b188abcc496a2eb6 100644 (file)
--- a/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-gcm-x86-64-macosx.s
@@ -1,3 +1,4 @@
+/*
 # Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
@@ -37,6 +38,7 @@
 #
 # *** This file is auto-generated ***
 #
+*/
 .text  
 
 .globl _gcm_gmult_4bit

diff --git a/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s b/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s
index 92b78ef76a64230f74986cda2b2ac94ff327788d..a82f0a55c6f0332e2ad1449a35ad3e65a104fa13 100644 (file)
--- a/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-x86-64-macosx.s
@@ -1,3 +1,4 @@
+/*
 # Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
@@ -37,6 +38,7 @@
 #
 # *** This file is auto-generated ***
 #
+*/
 .text  
 .globl _aesni_encrypt
 

diff --git a/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s b/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s
index af47a8cb18cef250c44f95cb297a51dff309e4e3..92313599bda91576ae4c0719482b838ea47cdd33 100644 (file)
--- a/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/appro-aes-x86-macosx.s
@@ -1,3 +1,4 @@
+/*
 # Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
@@ -37,6 +38,7 @@
 #
 # *** This file is auto-generated ***
 #
+*/
 .file  "devel/perlasm/aesni-x86.s"
 .text
 .globl _aesni_encrypt

diff --git a/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s b/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s
index c124584054fb7a4a18b62c0153788bafd5246143..26adc5b445c129a33009077998a8a931824bb8e6 100644 (file)
--- a/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/cpuid-x86-64-macosx.s
@@ -1,25 +1,44 @@
+/*
+# Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
+# All rights reserved.
 #
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
 #
-# Author: Nikos Mavrogiannopoulos
+#     * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
 #
-# This file is part of GnuTLS.
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
 #
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# ALTERNATIVELY, provided that this notice is retained in full, this
+# product may be distributed under the terms of the GNU General Public
+# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+# those given above.
 #
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # *** This file is auto-generated ***
 #
+*/
 .text  
 .globl _gnutls_cpuid
 

diff --git a/lib/accelerated/x86/macosx/cpuid-x86-macosx.s b/lib/accelerated/x86/macosx/cpuid-x86-macosx.s
index f32996f25f90b9d52cc9668e254f4a699559267c..0078f3d06fc660b415c888c34be510535cd9cf3f 100644 (file)
--- a/lib/accelerated/x86/macosx/cpuid-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/cpuid-x86-macosx.s
@@ -1,25 +1,44 @@
+/*
+# Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
+# All rights reserved.
 #
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
 #
-# Author: Nikos Mavrogiannopoulos
+#     * Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
 #
-# This file is part of GnuTLS.
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior written permission.
 #
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# ALTERNATIVELY, provided that this notice is retained in full, this
+# product may be distributed under the terms of the GNU General Public
+# License (GPL), in which case the provisions of the GPL apply INSTEAD OF
+# those given above.
 #
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # *** This file is auto-generated ***
 #
+*/
 .file  "devel/perlasm/cpuid-x86.s"
 .text
 .globl _gnutls_cpuid

diff --git a/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s b/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s
index dbd89daabcd4239190dea53830482ffcdad588ee..b9ec30c03caa73921bfa103afcfbd4c90ba3cb51 100644 (file)
--- a/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s
+++ b/lib/accelerated/x86/macosx/padlock-x86-64-macosx.s
@@ -1,3 +1,4 @@
+/*
 # Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
@@ -37,6 +38,7 @@
 #
 # *** This file is auto-generated ***
 #
+*/
 .text  
 .globl _padlock_capability
 

diff --git a/lib/accelerated/x86/macosx/padlock-x86-macosx.s b/lib/accelerated/x86/macosx/padlock-x86-macosx.s
index 40cfce9af294575d16f2e158219646a16a790bf3..7a38b7c3e1442a846225dcdc4314d82bf69264a4 100644 (file)
--- a/lib/accelerated/x86/macosx/padlock-x86-macosx.s
+++ b/lib/accelerated/x86/macosx/padlock-x86-macosx.s
@@ -1,3 +1,4 @@
+/*
 # Copyright (c) 2011-2012, Andy Polyakov <appro@openssl.org>
 # All rights reserved.
 #
@@ -37,6 +38,7 @@
 #
 # *** This file is auto-generated ***
 #
+*/
 .file  "devel/perlasm/e_padlock-x86.s"
 .text
 .globl _padlock_capability