From: Nikos Mavrogiannopoulos Date: Wed, 8 May 2013 10:34:02 +0000 (+0200) Subject: use C's style comments to compile in old MacOSX systems. Reported by Ryan Schmidt. X-Git-Tag: gnutls_3_2_0~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8264ebf9c85231ff87a8450fda8bb57cfb9f006b;p=thirdparty%2Fgnutls.git use C's style comments to compile in old MacOSX systems. Reported by Ryan Schmidt. --- diff --git a/cfg.mk b/cfg.mk index 449e35faa6..e613e4027b 100644 --- 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 8a966e2ab5..cfac705042 100644 --- 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 # 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 92b78ef76a..a82f0a55c6 100644 --- 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 # 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 af47a8cb18..92313599bd 100644 --- 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 # 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 c124584054..26adc5b445 100644 --- 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 +# 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 . +# 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 f32996f25f..0078f3d06f 100644 --- 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 +# 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 . +# 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 dbd89daabc..b9ec30c03c 100644 --- 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 # 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 40cfce9af2..7a38b7c3e1 100644 --- 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 # All rights reserved. # @@ -37,6 +38,7 @@ # # *** This file is auto-generated *** # +*/ .file "devel/perlasm/e_padlock-x86.s" .text .globl _padlock_capability