From: Nikos Mavrogiannopoulos Date: Thu, 20 Oct 2011 22:00:12 +0000 (+0200) Subject: updated gnustack note. X-Git-Tag: gnutls_3_0_5~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e8a47c58aef188e8d7f50014952e5eccf8f097f;p=thirdparty%2Fgnutls.git updated gnustack note. --- diff --git a/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s index 7e3c40737e..620cf479c7 100644 --- a/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s +++ b/lib/accelerated/x86/asm/appro-aes-gcm-x86-64.s @@ -1063,6 +1063,6 @@ gcm_ghash_clmul: .byte 71,72,65,83,72,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 64 -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif diff --git a/lib/accelerated/x86/asm/appro-aes-x86-64.s b/lib/accelerated/x86/asm/appro-aes-x86-64.s index 675e112ac9..efd6375798 100644 --- a/lib/accelerated/x86/asm/appro-aes-x86-64.s +++ b/lib/accelerated/x86/asm/appro-aes-x86-64.s @@ -2572,7 +2572,7 @@ __aesni_set_encrypt_key: .byte 65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69,83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 64 -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif diff --git a/lib/accelerated/x86/asm/appro-aes-x86.s b/lib/accelerated/x86/asm/appro-aes-x86.s index f095a63d87..b1ce9bc0d8 100644 --- a/lib/accelerated/x86/asm/appro-aes-x86.s +++ b/lib/accelerated/x86/asm/appro-aes-x86.s @@ -2180,7 +2180,7 @@ aesni_set_decrypt_key: .byte 32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115 .byte 115,108,46,111,114,103,62,0 -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif diff --git a/lib/accelerated/x86/asm/cpuid-x86-64.s b/lib/accelerated/x86/asm/cpuid-x86-64.s index 48b2cc4b66..09755ea2df 100644 --- a/lib/accelerated/x86/asm/cpuid-x86-64.s +++ b/lib/accelerated/x86/asm/cpuid-x86-64.s @@ -1,3 +1,24 @@ +# +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# Author: Nikos Mavrogiannopoulos +# +# This file is part of GnuTLS. +# +# 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 3 of +# the License, or (at your option) any later version. +# +# 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 . +# + .file "cpuid.asm" .text @@ -36,4 +57,6 @@ _gnutls_cpuid: .size _gnutls_cpuid, . - _gnutls_cpuid -.section .note.GNU-stack,"",@progbits +#if defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/lib/accelerated/x86/asm/cpuid-x86.s b/lib/accelerated/x86/asm/cpuid-x86.s index b286225048..bf3e6ac1a2 100644 --- a/lib/accelerated/x86/asm/cpuid-x86.s +++ b/lib/accelerated/x86/asm/cpuid-x86.s @@ -1,3 +1,24 @@ +# +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# Author: Nikos Mavrogiannopoulos +# +# This file is part of GnuTLS. +# +# 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 3 of +# the License, or (at your option) any later version. +# +# 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 . +# + .file "cpuid.asm" .text @@ -51,4 +72,6 @@ _gnutls_have_cpuid: .LFE0: .size _gnutls_have_cpuid, .-_gnutls_have_cpuid -.section .note.GNU-stack,"",@progbits +#if defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/lib/accelerated/x86/asm/padlock-common.s b/lib/accelerated/x86/asm/padlock-common.s index 3cd8695433..bd9123e953 100644 --- a/lib/accelerated/x86/asm/padlock-common.s +++ b/lib/accelerated/x86/asm/padlock-common.s @@ -39,6 +39,6 @@ is_padlock_nano: ret .size is_padlock_nano,.-is_padlock_nano -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif diff --git a/lib/accelerated/x86/asm/padlock-x86-64.s b/lib/accelerated/x86/asm/padlock-x86-64.s index ad3ab6de9c..156fe389ff 100644 --- a/lib/accelerated/x86/asm/padlock-x86-64.s +++ b/lib/accelerated/x86/asm/padlock-x86-64.s @@ -514,6 +514,6 @@ padlock_cbc_encrypt: .Lpadlock_saved_context: .quad 0 -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif diff --git a/lib/accelerated/x86/asm/padlock-x86.s b/lib/accelerated/x86/asm/padlock-x86.s index 9b3675e8fa..b2fca2164f 100644 --- a/lib/accelerated/x86/asm/padlock-x86.s +++ b/lib/accelerated/x86/asm/padlock-x86.s @@ -620,6 +620,6 @@ padlock_sha512_blocks: .Lpadlock_saved_context: .long 0 -#if defined(__linux__) && defined(__ELF__) +#if defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif