diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-22 18:42:17 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-22 18:42:20 +0200 |
| commit | 492999a33b389ac6ddfa0cb80c78409bd2d54e1c (patch) | |
| tree | b617b8a582ad6039e17e83efedd07047aa32d046 /thirdparty/libpng/arm | |
| parent | 8495acc510e54c0d148b9d97c3f78f22ce16fa15 (diff) | |
libpng: Update to upstream version 1.6.31rc01
Fixes various issues with 1.6.30, especially ARM build.
Supersedes change in #9722.
Diffstat (limited to 'thirdparty/libpng/arm')
| -rw-r--r-- | thirdparty/libpng/arm/filter_neon.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/libpng/arm/filter_neon.S b/thirdparty/libpng/arm/filter_neon.S index 3b061d6bbf..09267c6030 100644 --- a/thirdparty/libpng/arm/filter_neon.S +++ b/thirdparty/libpng/arm/filter_neon.S @@ -1,9 +1,9 @@ /* filter_neon.S - NEON optimised filter functions * - * Copyright (c) 2014 Glenn Randers-Pehrson + * Copyright (c) 2014,2017 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [December 22, 2014] + * Last changed in libpng 1.6.31 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -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 |