From eed9efec4e5de22f5375dc6dc13ed88074168bdf Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Jul 2017 05:36:05 -0500 Subject: [PATCH] [libpng16] Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish). --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- arm/filter_neon.S | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 0e3a902bb..4549c8dce 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.31beta01 - July 3, 2017 +Libpng 1.6.31beta01 - July 5, 2017 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -60,13 +60,14 @@ Version 1.6.30rc02 [June 25, 2017] Version 1.6.30 [June 28, 2017] No changes. -Version 1.6.31beta01 [July 3, 2017] +Version 1.6.31beta01 [July 5, 2017] Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it; bug report by Michael Felt). Revised pngpriv.h to work around failure to compile arm/filter_neon.S ("typedef" directive is unrecognized by the assembler). The problem was introduced in libpng-1.6.30beta01. Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx). + Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 7370895d3..87133d858 100644 --- a/CHANGES +++ b/CHANGES @@ -5855,13 +5855,14 @@ Version 1.6.30rc02 [June 25, 2017] Version 1.6.30 [June 28, 2017] No changes. -Version 1.6.31beta01 [July 3, 2017] +Version 1.6.31beta01 [July 5, 2017] Guard the definition of _POSIX_SOURCE in pngpriv.h (AIX already defines it; bug report by Michael Felt). Revised pngpriv.h to work around failure to compile arm/filter_neon.S ("typedef" directive is unrecognized by the assembler). The problem was introduced in libpng-1.6.30beta01. Added "Requires: zlib" to libpng.pc.in (Pieter Neerincx). + Added special case for FreeBSD in arm/filter_neon.S (Maya Rashish). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/arm/filter_neon.S b/arm/filter_neon.S index 3b061d6bb..11a4be126 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -16,7 +16,7 @@ #define PNG_VERSION_INFO_ONLY #include "../pngpriv.h" -#if defined(__linux__) && defined(__ELF__) +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__) .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif