svn commit: r319510 - head/contrib/xz/src/liblzma/check

[Ed Maste]

Author: emaste
Date: Sat Jun  3 02:42:49 2017
New Revision: 319510
URL: https://svnweb.freebsd.org/changeset/base/319510

Log:
  xz: set noexec stack flag on FreeBSD
  
  Will also be proposed upstream.
  
  Reviewed by:	delphij
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D11033

Modified:
  head/contrib/xz/src/liblzma/check/crc32_x86.S
  head/contrib/xz/src/liblzma/check/crc64_x86.S

Modified: head/contrib/xz/src/liblzma/check/crc32_x86.S
==============================================================================
--- head/contrib/xz/src/liblzma/check/crc32_x86.S	Fri Jun  2 22:35:18 2017	(r319509)
+++ head/contrib/xz/src/liblzma/check/crc32_x86.S	Sat Jun  3 02:42:49 2017	(r319510)
@@ -299,6 +299,6 @@ LZMA_CRC32:
  * use __linux__ here, but I don't know a way to detect when
  * we are using GNU assembler.
  */
-#if defined(__ELF__) && defined(__linux__)
+#if defined(__ELF__) && (defined(__FreeBSD__) || defined(__linux__))
 	.section	.note.GNU-stack,"", at progbits
 #endif

Modified: head/contrib/xz/src/liblzma/check/crc64_x86.S
==============================================================================
--- head/contrib/xz/src/liblzma/check/crc64_x86.S	Fri Jun  2 22:35:18 2017	(r319509)
+++ head/contrib/xz/src/liblzma/check/crc64_x86.S	Sat Jun  3 02:42:49 2017	(r319510)
@@ -282,6 +282,6 @@ LZMA_CRC64:
  * use __linux__ here, but I don't know a way to detect when
  * we are using GNU assembler.
  */
-#if defined(__ELF__) && defined(__linux__)
+#if defined(__ELF__) && (defined(__FreeBSD__) || defined(__linux__))
 	.section	.note.GNU-stack,"", at progbits
 #endif