diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-06-22 16:59:16 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-06-22 16:59:39 +0900 |
| commit | 8ff61daa672f051d8ecb537edc94036b6cdaaf3f (patch) | |
| tree | 455cc4eb438541a1ff3e7bb50c7abc458f189269 /asm | |
| parent | 79a9578a33ecd3093970bd18df677edc9214fafb (diff) | |
| download | lzo-8ff61daa672f051d8ecb537edc94036b6cdaaf3f.tar.gz lzo-8ff61daa672f051d8ecb537edc94036b6cdaaf3f.tar.bz2 lzo-8ff61daa672f051d8ecb537edc94036b6cdaaf3f.zip | |
Imported Upstream version 2.09
Change-Id: Iff3c94491fe695b43f1d6998f93f56af871806a2
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'asm')
36 files changed, 164 insertions, 123 deletions
diff --git a/asm/i386/src/enter.ash b/asm/i386/src/enter.ash index c121c57..fbfc9b8 100644 --- a/asm/i386/src/enter.ash +++ b/asm/i386/src/enter.ash @@ -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 @@ -71,7 +71,4 @@ #endif -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/leave.ash b/asm/i386/src/leave.ash index 2aa0286..209e2bb 100644 --- a/asm/i386/src/leave.ash +++ b/asm/i386/src/leave.ash @@ -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 @@ -96,7 +96,4 @@ .L_end: -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1c_d.ash b/asm/i386/src/lzo1c_d.ash index 4560452..d373ed2 100644 --- a/asm/i386/src/lzo1c_d.ash +++ b/asm/i386/src/lzo1c_d.ash @@ -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 @@ -166,7 +166,4 @@ setnz %al -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1c_s1.S b/asm/i386/src/lzo1c_s1.S index d1cdd62..2de4463 100644 --- a/asm/i386/src/lzo1c_s1.S +++ b/asm/i386/src/lzo1c_s1.S @@ -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 @@ -43,7 +43,4 @@ LZO_PUBLIC_END(lzo1c_decompress_asm) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1f_d.ash b/asm/i386/src/lzo1f_d.ash index 50248d8..edbe0a6 100644 --- a/asm/i386/src/lzo1f_d.ash +++ b/asm/i386/src/lzo1f_d.ash @@ -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 @@ -158,7 +158,4 @@ setnz %al -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1f_f1.S b/asm/i386/src/lzo1f_f1.S index 5566cc5..b77c894 100644 --- a/asm/i386/src/lzo1f_f1.S +++ b/asm/i386/src/lzo1f_f1.S @@ -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 @@ -43,7 +43,4 @@ LZO_PUBLIC_END(lzo1f_decompress_asm_fast) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1x_d.ash b/asm/i386/src/lzo1x_d.ash index a05f15d..35d1ca4 100644 --- a/asm/i386/src/lzo1x_d.ash +++ b/asm/i386/src/lzo1x_d.ash @@ -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 @@ -383,7 +383,4 @@ setnz %al -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1x_f1.S b/asm/i386/src/lzo1x_f1.S index f9706f1..2081052 100644 --- a/asm/i386/src/lzo1x_f1.S +++ b/asm/i386/src/lzo1x_f1.S @@ -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 @@ -45,7 +45,4 @@ LZO_PUBLIC_END(lzo1x_decompress_asm_fast) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1x_s1.S b/asm/i386/src/lzo1x_s1.S index 198980d..c034d7a 100644 --- a/asm/i386/src/lzo1x_s1.S +++ b/asm/i386/src/lzo1x_s1.S @@ -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 @@ -43,7 +43,4 @@ LZO_PUBLIC_END(lzo1x_decompress_asm) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1y_f1.S b/asm/i386/src/lzo1y_f1.S index 98ab915..2fbd022 100644 --- a/asm/i386/src/lzo1y_f1.S +++ b/asm/i386/src/lzo1y_f1.S @@ -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 @@ -47,7 +47,4 @@ LZO_PUBLIC_END(lzo1y_decompress_asm_fast) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo1y_s1.S b/asm/i386/src/lzo1y_s1.S index b48212f..245a8f7 100644 --- a/asm/i386/src/lzo1y_s1.S +++ b/asm/i386/src/lzo1y_s1.S @@ -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 @@ -45,7 +45,4 @@ LZO_PUBLIC_END(lzo1y_decompress_asm) -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src/lzo_asm.h b/asm/i386/src/lzo_asm.h index 1958517..538b408 100644 --- a/asm/i386/src/lzo_asm.h +++ b/asm/i386/src/lzo_asm.h @@ -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 @@ -268,8 +268,4 @@ #endif - -/* -vi:ts=4 -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/asm/i386/src_gas/all/asm_all.S b/asm/i386/src_gas/all/asm_all.S index 6da894b..730ed07 100644 --- a/asm/i386/src_gas/all/asm_all.S +++ b/asm/i386/src_gas/all/asm_all.S @@ -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 @@ -27,36 +27,60 @@ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ +#ifndef NAME1 #if (defined(__MACH__) && defined(__APPLE__)) -# 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 +#ifndef LZO_PP_CONCAT2 +# define LZO_PP_CONCAT2(a,b) a ## b #endif #ifndef p2align -# define p2align(x) .p2align x +# define p2align(a) .p2align a #endif #ifndef globalf -# define globalf(x) .globl x +# define globalf(a) .globl a +#endif +#ifndef hiddenf +# if defined(__ELF__) +# define hiddenf(a) .hidden a +# elif (defined(__MACH__) && defined(__APPLE__)) +# define hiddenf(a) .private_extern a +# else +# define hiddenf(a) +# endif #endif #ifndef typef # if defined(__ELF__) -# define typef(x) .type x,@function +# define typef(a) .type a,@function # else -# define typef(x) +# define typef(a) # endif #endif #ifndef sizef # if defined(__ELF__) -# define sizef(x,s) .size x,s +# define sizef(a,b) .size a,b # else -# define sizef(x,s) +# define sizef(a,b) # endif #endif #if defined(__ELF__) .section .note.GNU-stack,"",@progbits #endif .text +#if defined(_WIN32) || defined(__WIN32__) +# if defined(LZO_WIN32_FEAT_00) +# LZO_WIN32_FEAT_00 +# else +#if defined(__GNUC__) && !defined(__clang__) +.globl @feat.00 +#endif +@feat.00 = 1 +# endif +#endif #if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__) p2align(6) #else diff --git a/asm/i386/src_gas/asminit.def b/asm/i386/src_gas/asminit.def index 1115582..257190d 100644 --- a/asm/i386/src_gas/asminit.def +++ b/asm/i386/src_gas/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 @@ -25,31 +25,46 @@ http://www.oberhumer.com/opensource/lzo/ */ +#ifndef NAME1 #if (defined(__MACH__) && defined(__APPLE__)) -# 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 + +#ifndef LZO_PP_CONCAT2 +# define LZO_PP_CONCAT2(a,b) a ## b #endif #ifndef p2align -# define p2align(x) .p2align x +# define p2align(a) .p2align a #endif #ifndef globalf -# define globalf(x) .globl x +# define globalf(a) .globl a +#endif +#ifndef hiddenf +# if defined(__ELF__) +# define hiddenf(a) .hidden a +# elif (defined(__MACH__) && defined(__APPLE__)) +# define hiddenf(a) .private_extern a +# else +# define hiddenf(a) +# endif #endif #ifndef typef # if defined(__ELF__) -# define typef(x) .type x,@function +# define typef(a) .type a,@function # else -# define typef(x) +# define typef(a) # endif #endif #ifndef sizef # if defined(__ELF__) -# define sizef(x,s) .size x,s +# define sizef(a,b) .size a,b # else -# define sizef(x,s) +# define sizef(a,b) # endif #endif @@ -57,6 +72,16 @@ .section .note.GNU-stack,"",@progbits #endif .text +#if defined(_WIN32) || defined(__WIN32__) +# if defined(LZO_WIN32_FEAT_00) +# LZO_WIN32_FEAT_00 +# else +#if defined(__GNUC__) && !defined(__clang__) +.globl @feat.00 +#endif +@feat.00 = 1 +# endif +#endif #if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__) p2align(6) #else diff --git a/asm/i386/src_gas/lzo1c_s1.S b/asm/i386/src_gas/lzo1c_s1.S index c21ef48..4f15ca8 100644 --- a/asm/i386/src_gas/lzo1c_s1.S +++ b/asm/i386/src_gas/lzo1c_s1.S @@ -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_gas/lzo1f_f1.S b/asm/i386/src_gas/lzo1f_f1.S index eec8c8a..a2c3c4e 100644 --- a/asm/i386/src_gas/lzo1f_f1.S +++ b/asm/i386/src_gas/lzo1f_f1.S @@ -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_gas/lzo1x_f1.S b/asm/i386/src_gas/lzo1x_f1.S index 87ef8d7..8e2bcc9 100644 --- a/asm/i386/src_gas/lzo1x_f1.S +++ b/asm/i386/src_gas/lzo1x_f1.S @@ -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_gas/lzo1x_s1.S b/asm/i386/src_gas/lzo1x_s1.S index 69523a7..ed43092 100644 --- a/asm/i386/src_gas/lzo1x_s1.S +++ b/asm/i386/src_gas/lzo1x_s1.S @@ -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_gas/lzo1y_f1.S b/asm/i386/src_gas/lzo1y_f1.S index cfc5993..32ee007 100644 --- a/asm/i386/src_gas/lzo1y_f1.S +++ b/asm/i386/src_gas/lzo1y_f1.S @@ -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_gas/lzo1y_s1.S b/asm/i386/src_gas/lzo1y_s1.S index b7900ca..6a52bbb 100644 --- a/asm/i386/src_gas/lzo1y_s1.S +++ b/asm/i386/src_gas/lzo1y_s1.S @@ -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_masm/all/asm_all.asm b/asm/i386/src_masm/all/asm_all.asm index c35e296..bda48d4 100644 --- a/asm/i386/src_masm/all/asm_all.asm +++ b/asm/i386/src_masm/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 diff --git a/asm/i386/src_masm/asminit.def b/asm/i386/src_masm/asminit.def index 81a9d21..749eb9b 100644 --- a/asm/i386/src_masm/asminit.def +++ b/asm/i386/src_masm/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 diff --git a/asm/i386/src_masm/lzo1c_s1.asm b/asm/i386/src_masm/lzo1c_s1.asm index f6aae35..f9418df 100644 --- a/asm/i386/src_masm/lzo1c_s1.asm +++ b/asm/i386/src_masm/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_masm/lzo1f_f1.asm b/asm/i386/src_masm/lzo1f_f1.asm index 23ee449..ec51f0b 100644 --- a/asm/i386/src_masm/lzo1f_f1.asm +++ b/asm/i386/src_masm/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_masm/lzo1x_f1.asm b/asm/i386/src_masm/lzo1x_f1.asm index 7e77a17..efe2f04 100644 --- a/asm/i386/src_masm/lzo1x_f1.asm +++ b/asm/i386/src_masm/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_masm/lzo1x_s1.asm b/asm/i386/src_masm/lzo1x_s1.asm index f466aa8..1c31acc 100644 --- a/asm/i386/src_masm/lzo1x_s1.asm +++ b/asm/i386/src_masm/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_masm/lzo1y_f1.asm b/asm/i386/src_masm/lzo1y_f1.asm index c4ff7a3..f111ccb 100644 --- a/asm/i386/src_masm/lzo1y_f1.asm +++ b/asm/i386/src_masm/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_masm/lzo1y_s1.asm b/asm/i386/src_masm/lzo1y_s1.asm index 4c8d710..c777948 100644 --- a/asm/i386/src_masm/lzo1y_s1.asm +++ b/asm/i386/src_masm/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 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 |