diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-08-10 13:51:40 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2015-08-10 13:51:40 +0200 |
| commit | 98399ed51045871f8d73599322b6947d6b2b80d0 (patch) | |
| tree | 28eb352fc1fd89f9c0969cfe0e7c384dee8b17df /main/lzo/asm/i386/src_nasm/all | |
| parent | e6af88b346e9eb5be462429bf9786e7e89ce0e0d (diff) | |
Update lzo to 2.09
Diffstat (limited to 'main/lzo/asm/i386/src_nasm/all')
| -rw-r--r-- | main/lzo/asm/i386/src_nasm/all/asm_all.asm | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/main/lzo/asm/i386/src_nasm/all/asm_all.asm b/main/lzo/asm/i386/src_nasm/all/asm_all.asm index b0df7de7..f453e626 100644 --- a/main/lzo/asm/i386/src_nasm/all/asm_all.asm +++ b/main/lzo/asm/i386/src_nasm/all/asm_all.asm @@ -2,7 +2,7 @@ ; ; This file is part of the LZO real-time data compression library. ; -; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer +; Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer ; All Rights Reserved. ; ; The LZO library is free software; you can redistribute it and/or @@ -49,23 +49,36 @@ bits 32 %define __OUTPUT_FORMAT__ win64 %endif %endif +%ifndef NAME1 %ifidni __OUTPUT_FORMAT__,macho32 -%define NAME1(x) _ %+ x +%define NAME1(a) _ %+ a %elifidni __OUTPUT_FORMAT__,macho64 -%define NAME1(x) _ %+ x +%define NAME1(a) _ %+ a %else -%define NAME1(x) _ %+ x -%define NAME2(x) x +%define NAME1(a) _ %+ a +%define NAME2(a) a +%endif %endif %ifidni __OUTPUT_FORMAT__,elf32 -%define globalf(x) global x:function (x %+ _end - x) -%define globalf_end(x) x %+ _end: +%define globalf(a) global a:function (a %+ _end - a) +%define globalfh(a) global a:function hidden (a %+ _end - a) +%define globalf_end(a) a %+ _end: %elifidni __OUTPUT_FORMAT__,elf64 -%define globalf(x) global x:function (x %+ _end - x) -%define globalf_end(x) x %+ _end: +%define globalf(a) global a:function (a %+ _end - a) +%define globalfh(a) global a:function hidden (a %+ _end - a) +%define globalf_end(a) a %+ _end: %else -%define globalf(x) global x -%define globalf_end(x) +%define globalf(a) global a +%define globalfh(a) global a +%define globalf_end(a) +%endif +%ifndef LZO_SEH_EXCEPTIONS +%ifidni __OUTPUT_FORMAT__,win64 +%define LZO_SEH_EXCEPTIONS 1 +%endif +%endif +%ifndef LZO_SEH_EXCEPTIONS +%define LZO_SEH_EXCEPTIONS 0 %endif %ifidni __OUTPUT_FORMAT__,elf32 section .note.GNU-stack noalloc noexec nowrite progbits |