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 7e3c40737e9443450b9d84594fc8174ffcf7ca27..620cf479c786a2daa3880d2240225fdcd1a10628 100644 (file)
--- 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 675e112ac9833991626bce97700004a716e1b11e..efd6375798819816cf7160ae8049d1adc4719b47 100644 (file)
--- 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 f095a63d87f88812d2c6282f5bfa20d75d72128f..b1ce9bc0d80f1f4731d503ec7ae5a499c4fa8364 100644 (file)
--- 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 48b2cc4b66a31a58aa61f4b76b7b37f53b8d5b69..09755ea2dfe297a94cc6db7b258aef8b71346436 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+#
+
        .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 b286225048e3f03a2a4167ee9dc6eb75f2c30ea5..bf3e6ac1a233c4fb027435cc92183e54632e7e7d 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+#
+
        .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 3cd869543364b9e56462672a96ea0c787f27748e..bd9123e9539ad133f4b1f94a58466d6e789617cc 100644 (file)
--- 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 ad3ab6de9c920f63f533615380cd55109b386227..156fe389ff11f9cb8e0dabfe8c03247e4e3405db 100644 (file)
--- 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 9b3675e8fac761515d403d28525915aeaeb9bb87..b2fca2164fbef2f6d679d65b6969eefbafc253fb 100644 (file)
--- 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