From: Nikos Mavrogiannopoulos Date: Mon, 8 Aug 2011 18:02:47 +0000 (+0200) Subject: Added note.GNU-stack to prevent marking the library as using an executable stack... X-Git-Tag: gnutls_3_0_1~15^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c04eec439adc54a476ecf5d3d56878b929aa6f9e;p=thirdparty%2Fgnutls.git Added note.GNU-stack to prevent marking the library as using an executable stack. Reported by Andreas Metzler. --- diff --git a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s index 009ec3d5d8..7e3c40737e 100644 --- a/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s +++ b/lib/accelerated/intel/asm/appro-aes-gcm-x86-64.s @@ -1062,3 +1062,7 @@ 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__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/lib/accelerated/intel/asm/appro-aes-x86-64.s b/lib/accelerated/intel/asm/appro-aes-x86-64.s index f286fb12bd..675e112ac9 100644 --- a/lib/accelerated/intel/asm/appro-aes-x86-64.s +++ b/lib/accelerated/intel/asm/appro-aes-x86-64.s @@ -2571,3 +2571,8 @@ __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__) +.section .note.GNU-stack,"",%progbits +#endif + diff --git a/lib/accelerated/intel/asm/appro-aes-x86.s b/lib/accelerated/intel/asm/appro-aes-x86.s index 2084749838..f095a63d87 100644 --- a/lib/accelerated/intel/asm/appro-aes-x86.s +++ b/lib/accelerated/intel/asm/appro-aes-x86.s @@ -2179,3 +2179,8 @@ aesni_set_decrypt_key: .byte 83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83 .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__) +.section .note.GNU-stack,"",%progbits +#endif +