ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
DRC
2019-11-05 15:43:21 -06:00
parent 087c29e07f cf54623b08
commit bbedb4b564
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BUILDING.md
View File

@@ -15,12 +15,14 @@ Build Requirements
* If using NASM, 2.10 or later is required. * If using NASM, 2.10 or later is required.
* If using NASM, 2.10 or later (except 2.11.08) is required for an x86-64 Mac * If using NASM, 2.10 or later (except 2.11.08) is required for an x86-64 Mac
build (2.11.08 does not work properly with libjpeg-turbo's x86-64 SIMD code build (2.11.08 does not work properly with libjpeg-turbo's x86-64 SIMD code
when building macho64 objects.) NASM or YASM can be obtained from when building macho64 objects.)
[MacPorts](http://www.macports.org/) or [Homebrew](http://brew.sh/).
* If using YASM, 1.2.0 or later is required. * If using YASM, 1.2.0 or later is required.
* If building on macOS, NASM or YASM can be obtained from
[MacPorts](http://www.macports.org/) or [Homebrew](http://brew.sh/).
- NOTE: Currently, if it is desirable to hide the SIMD function symbols in - NOTE: Currently, if it is desirable to hide the SIMD function symbols in
Mac executables or shared libraries that statically link with Mac executables or shared libraries that statically link with
libjpeg-turbo, then YASM must be used when building libjpeg-turbo. libjpeg-turbo, then NASM 2.14 or later or YASM must be used when
building libjpeg-turbo.
* If building on Windows, **nasm.exe**/**yasm.exe** should be in your `PATH`. * If building on Windows, **nasm.exe**/**yasm.exe** should be in your `PATH`.
* NASM and YASM are located in the CRB (Code Ready Builder) repository on * NASM and YASM are located in the CRB (Code Ready Builder) repository on
Red Hat Enterprise Linux 8 and in the PowerTools repository on CentOS 8, Red Hat Enterprise Linux 8 and in the PowerTools repository on CentOS 8,

7
simd/nasm/jsimdext.inc
View File

@@ -2,7 +2,7 @@
; jsimdext.inc - common declarations ; jsimdext.inc - common declarations
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2010, 2016, 2018, D. R. Commander. ; Copyright (C) 2010, 2016, 2018-2019, D. R. Commander.
; Copyright (C) 2018, Matthieu Darbois. ; Copyright (C) 2018, Matthieu Darbois.
; Copyright (C) 2018, Matthias Räncker. ; Copyright (C) 2018, Matthias Räncker.
; ;
@@ -237,6 +237,11 @@ section .note.GNU-stack noalloc noexec nowrite progbits
%ifdef __YASM_VER__ %ifdef __YASM_VER__
%define GLOBAL_FUNCTION(name) global EXTN(name):private_extern %define GLOBAL_FUNCTION(name) global EXTN(name):private_extern
%define GLOBAL_DATA(name) global EXTN(name):private_extern %define GLOBAL_DATA(name) global EXTN(name):private_extern
%else
%if __NASM_VERSION_ID__ >= 0x020E0000
%define GLOBAL_FUNCTION(name) global EXTN(name):private_extern
%define GLOBAL_DATA(name) global EXTN(name):private_extern
%endif
%endif %endif
%endif %endif