From 8ff61daa672f051d8ecb537edc94036b6cdaaf3f Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 22 Jun 2017 16:59:16 +0900 Subject: Imported Upstream version 2.09 Change-Id: Iff3c94491fe695b43f1d6998f93f56af871806a2 Signed-off-by: DongHun Kwak --- asm/i386/src_nasm/all/asm_all.asm | 35 ++++++++++++++++++++++++----------- asm/i386/src_nasm/asminit.def | 38 +++++++++++++++++++++++++++----------- asm/i386/src_nasm/lzo1c_s1.asm | 2 +- asm/i386/src_nasm/lzo1f_f1.asm | 2 +- asm/i386/src_nasm/lzo1x_f1.asm | 2 +- asm/i386/src_nasm/lzo1x_s1.asm | 2 +- asm/i386/src_nasm/lzo1y_f1.asm | 2 +- asm/i386/src_nasm/lzo1y_s1.asm | 2 +- 8 files changed, 57 insertions(+), 28 deletions(-) (limited to 'asm/i386/src_nasm') diff --git a/asm/i386/src_nasm/all/asm_all.asm b/asm/i386/src_nasm/all/asm_all.asm index b0df7de..f453e62 100644 --- a/asm/i386/src_nasm/all/asm_all.asm +++ b/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 diff --git a/asm/i386/src_nasm/asminit.def b/asm/i386/src_nasm/asminit.def index 0ccdb8d..773cf99 100644 --- a/asm/i386/src_nasm/asminit.def +++ b/asm/i386/src_nasm/asminit.def @@ -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 @@ -48,24 +48,40 @@ bits 32 %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 +%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 +%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 diff --git a/asm/i386/src_nasm/lzo1c_s1.asm b/asm/i386/src_nasm/lzo1c_s1.asm index e35e627..982b474 100644 --- a/asm/i386/src_nasm/lzo1c_s1.asm +++ b/asm/i386/src_nasm/lzo1c_s1.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 diff --git a/asm/i386/src_nasm/lzo1f_f1.asm b/asm/i386/src_nasm/lzo1f_f1.asm index 514ab47..ccf37ed 100644 --- a/asm/i386/src_nasm/lzo1f_f1.asm +++ b/asm/i386/src_nasm/lzo1f_f1.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 diff --git a/asm/i386/src_nasm/lzo1x_f1.asm b/asm/i386/src_nasm/lzo1x_f1.asm index 585963b..e269caa 100644 --- a/asm/i386/src_nasm/lzo1x_f1.asm +++ b/asm/i386/src_nasm/lzo1x_f1.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 diff --git a/asm/i386/src_nasm/lzo1x_s1.asm b/asm/i386/src_nasm/lzo1x_s1.asm index 98790b9..ad054be 100644 --- a/asm/i386/src_nasm/lzo1x_s1.asm +++ b/asm/i386/src_nasm/lzo1x_s1.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 diff --git a/asm/i386/src_nasm/lzo1y_f1.asm b/asm/i386/src_nasm/lzo1y_f1.asm index 6ca700d..ddd55fb 100644 --- a/asm/i386/src_nasm/lzo1y_f1.asm +++ b/asm/i386/src_nasm/lzo1y_f1.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 diff --git a/asm/i386/src_nasm/lzo1y_s1.asm b/asm/i386/src_nasm/lzo1y_s1.asm index b5c6ee7..ce88004 100644 --- a/asm/i386/src_nasm/lzo1y_s1.asm +++ b/asm/i386/src_nasm/lzo1y_s1.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 -- cgit v1.2.3