diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:34:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:35:01 +0900 |
| commit | 46a0aa70a35939815807200bf1fa20c40eb70a8f (patch) | |
| tree | fb9e6c918b2d0ab3935e96ec36bc4cc6f578cac5 /asm | |
| parent | a97fbf725aa75db53756b59df6888e59b47c931d (diff) | |
| parent | cf55f4b64fc18401baba427c6d5ea4cb7b1ed094 (diff) | |
| download | lzo-accepted/tizen/6.5/unified/20211029.014748.tar.gz lzo-accepted/tizen/6.5/unified/20211029.014748.tar.bz2 lzo-accepted/tizen/6.5/unified/20211029.014748.zip | |
Merge branch 'tizen_base' into tizentizen_9.0_m2_releasetizen_8.0_m2_releasetizen_7.0_m2_releasetizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen_6.0_hotfix/20201103.115103submit/tizen_6.0_hotfix/20201102.192903submit/tizen_6.0/20201029.205503submit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen_5.0/20181101.000007submit/tizen/20180615.072409submit/tizen/20180612.085133submit/tizen/20180612.084651accepted/tizen/unified/20180618.151445accepted/tizen/9.0/unified/20241030.232558accepted/tizen/8.0/unified/20231005.095211accepted/tizen/7.0/unified/hotfix/20221116.111123accepted/tizen/7.0/unified/20221110.060805accepted/tizen/6.5/unified/20211029.014748accepted/tizen/6.0/unified/hotfix/20201102.231413accepted/tizen/6.0/unified/20201030.112922accepted/tizen/5.5/unified/wearable/hotfix/20201027.101023accepted/tizen/5.5/unified/mobile/hotfix/20201027.074655accepted/tizen/5.5/unified/20191031.012511accepted/tizen/5.0/unified/20181102.031024tizen_9.0tizen_7.0_hotfixtizen_7.0tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0accepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unifiedaccepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Change-Id: I005b25a1dcc898cbdf59ac1559529584eed017af
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'asm')
48 files changed, 214 insertions, 129 deletions
diff --git a/asm/i386/obj/elf32/lzo1c_s1.o b/asm/i386/obj/elf32/lzo1c_s1.o Binary files differindex 59f320e..eb4429e 100644 --- a/asm/i386/obj/elf32/lzo1c_s1.o +++ b/asm/i386/obj/elf32/lzo1c_s1.o diff --git a/asm/i386/obj/elf32/lzo1f_f1.o b/asm/i386/obj/elf32/lzo1f_f1.o Binary files differindex 064b1c5..3134a85 100644 --- a/asm/i386/obj/elf32/lzo1f_f1.o +++ b/asm/i386/obj/elf32/lzo1f_f1.o diff --git a/asm/i386/obj/elf32/lzo1x_f1.o b/asm/i386/obj/elf32/lzo1x_f1.o Binary files differindex 470fb75..fc96ecc 100644 --- a/asm/i386/obj/elf32/lzo1x_f1.o +++ b/asm/i386/obj/elf32/lzo1x_f1.o diff --git a/asm/i386/obj/elf32/lzo1x_s1.o b/asm/i386/obj/elf32/lzo1x_s1.o Binary files differindex 8483013..817386d 100644 --- a/asm/i386/obj/elf32/lzo1x_s1.o +++ b/asm/i386/obj/elf32/lzo1x_s1.o diff --git a/asm/i386/obj/elf32/lzo1y_f1.o b/asm/i386/obj/elf32/lzo1y_f1.o Binary files differindex 5ac4a8f..15300e8 100644 --- a/asm/i386/obj/elf32/lzo1y_f1.o +++ b/asm/i386/obj/elf32/lzo1y_f1.o diff --git a/asm/i386/obj/elf32/lzo1y_s1.o b/asm/i386/obj/elf32/lzo1y_s1.o Binary files differindex eb265ab..2fdd42e 100644 --- a/asm/i386/obj/elf32/lzo1y_s1.o +++ b/asm/i386/obj/elf32/lzo1y_s1.o diff --git a/asm/i386/obj/win32/lzo1c_s1.obj b/asm/i386/obj/win32/lzo1c_s1.obj Binary files differindex ef6189c..b9703e8 100644 --- a/asm/i386/obj/win32/lzo1c_s1.obj +++ b/asm/i386/obj/win32/lzo1c_s1.obj diff --git a/asm/i386/obj/win32/lzo1f_f1.obj b/asm/i386/obj/win32/lzo1f_f1.obj Binary files differindex 83bafa9..e0c0295 100644 --- a/asm/i386/obj/win32/lzo1f_f1.obj +++ b/asm/i386/obj/win32/lzo1f_f1.obj diff --git a/asm/i386/obj/win32/lzo1x_f1.obj b/asm/i386/obj/win32/lzo1x_f1.obj Binary files differindex 83dc586..c6c1f80 100644 --- a/asm/i386/obj/win32/lzo1x_f1.obj +++ b/asm/i386/obj/win32/lzo1x_f1.obj diff --git a/asm/i386/obj/win32/lzo1x_s1.obj b/asm/i386/obj/win32/lzo1x_s1.obj Binary files differindex dff65d3..b95eb96 100644 --- a/asm/i386/obj/win32/lzo1x_s1.obj +++ b/asm/i386/obj/win32/lzo1x_s1.obj diff --git a/asm/i386/obj/win32/lzo1y_f1.obj b/asm/i386/obj/win32/lzo1y_f1.obj Binary files differindex 5c0d1c2..3082791 100644 --- a/asm/i386/obj/win32/lzo1y_f1.obj +++ b/asm/i386/obj/win32/lzo1y_f1.obj diff --git a/asm/i386/obj/win32/lzo1y_s1.obj b/asm/i386/obj/win32/lzo1y_s1.obj Binary files differindex 68c5d30..1c34c7b 100644 --- a/asm/i386/obj/win32/lzo1y_s1.obj +++ b/asm/i386/obj/win32/lzo1y_s1.obj diff --git a/asm/i386/src/enter.ash b/asm/i386/src/enter.ash index c121c57..cc5941b 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-2017 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..dbaeda0 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-2017 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..0d41024 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-2017 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..03ca397 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-2017 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..99093f6 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-2017 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..212b62f 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-2017 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..4635a2a 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-2017 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..4f02add 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-2017 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..d706fc2 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-2017 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..2982c32 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-2017 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..ddf8574 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-2017 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..7227b31 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-2017 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..8aa67cb 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-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -27,37 +27,75 @@ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ -#if (defined(__MACH__) && defined(__APPLE__)) -# define NAME1(x) _ ## x +#undef _ +#ifndef NAME1 +#if defined(__ELF__) +# define NAME1(a) a +#elif (defined(__MACH__) && defined(__APPLE__)) +# define NAME1(a) _ ## a +#elif defined(_WIN32) && !defined(_WIN64) +# define NAME1(a) _ ## a +#elif defined(_WIN64) +# define NAME1(a) a #else -# define NAME1(x) _ ## x -# define NAME2(x) x +# define NAME1(a) _ ## a +# define NAME2(a) a +#endif +#endif +#define XNAME(a,b,c) LZO_PP_ECONCAT3(NAME1(a),b,c) +#ifndef LZO_PP_CONCAT2 +# define LZO_PP_CONCAT2(a,b) a ## b +#endif +#ifndef LZO_PP_CONCAT3 +# define LZO_PP_CONCAT3(a,b,c) a ## b ## c +#endif +#ifndef LZO_PP_ECONCAT3 +# define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) #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(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__) +#if defined(_WIN32) && !defined(_WIN64) +#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(_WIN64) p2align(6) #else p2align(4) diff --git a/asm/i386/src_gas/asminit.def b/asm/i386/src_gas/asminit.def index 1115582..0f1859e 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-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -25,31 +25,60 @@ http://www.oberhumer.com/opensource/lzo/ */ -#if (defined(__MACH__) && defined(__APPLE__)) -# define NAME1(x) _ ## x +#undef _ +#ifndef NAME1 +#if defined(__ELF__) +# define NAME1(a) a +#elif (defined(__MACH__) && defined(__APPLE__)) +# define NAME1(a) _ ## a +#elif defined(_WIN32) && !defined(_WIN64) +# define NAME1(a) _ ## a +#elif defined(_WIN64) +# define NAME1(a) a #else -# define NAME1(x) _ ## x -# define NAME2(x) x +# define NAME1(a) _ ## a +# define NAME2(a) a +#endif +#endif +#define XNAME(a,b,c) LZO_PP_ECONCAT3(NAME1(a),b,c) + +#ifndef LZO_PP_CONCAT2 +# define LZO_PP_CONCAT2(a,b) a ## b +#endif +#ifndef LZO_PP_CONCAT3 +# define LZO_PP_CONCAT3(a,b,c) a ## b ## c +#endif +#ifndef LZO_PP_ECONCAT3 +# define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) #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) /*empty*/ +# 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) /*empty*/ # 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) /*empty*/ # endif #endif @@ -57,7 +86,17 @@ .section .note.GNU-stack,"",@progbits #endif .text -#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__) +#if defined(_WIN32) && !defined(_WIN64) +#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(_WIN64) p2align(6) #else p2align(4) diff --git a/asm/i386/src_gas/lzo1c_s1.S b/asm/i386/src_gas/lzo1c_s1.S index c21ef48..374e60f 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-2017 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..4c5427b 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-2017 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..9ca92c3 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-2017 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..3e31c18 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-2017 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..b3129c3 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-2017 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..c67db49 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-2017 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..58ae470 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-2017 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..5754d78 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-2017 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..67016e3 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-2017 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..f1252af 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-2017 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..95feaa2 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-2017 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..4af988a 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-2017 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..d86112a 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-2017 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..3c4ab48 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-2017 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..87260c0 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-2017 Markus Franz Xaver Johannes Oberhumer ; All Rights Reserved. ; ; The LZO library is free software; you can redistribute it and/or @@ -49,23 +49,44 @@ bits 32 %define __OUTPUT_FORMAT__ win64 %endif %endif -%ifidni __OUTPUT_FORMAT__,macho32 -%define NAME1(x) _ %+ x +%ifndef NAME1 +%ifidni __OUTPUT_FORMAT__,elf32 +%define NAME1(a) a +%elifidni __OUTPUT_FORMAT__,elf64 +%define NAME1(a) a +%elifidni __OUTPUT_FORMAT__,macho32 +%define NAME1(a) _ %+ a %elifidni __OUTPUT_FORMAT__,macho64 -%define NAME1(x) _ %+ x +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win32 +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win64 +%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..db792af 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-2017 Markus Franz Xaver Johannes Oberhumer ; All Rights Reserved. ; ; The LZO library is free software; you can redistribute it and/or @@ -48,24 +48,48 @@ bits 32 %endif %endif -%ifidni __OUTPUT_FORMAT__,macho32 -%define NAME1(x) _ %+ x +%ifndef NAME1 +%ifidni __OUTPUT_FORMAT__,elf32 +%define NAME1(a) a +%elifidni __OUTPUT_FORMAT__,elf64 +%define NAME1(a) a +%elifidni __OUTPUT_FORMAT__,macho32 +%define NAME1(a) _ %+ a %elifidni __OUTPUT_FORMAT__,macho64 -%define NAME1(x) _ %+ x +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win32 +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win64 +%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..cb408e0 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-2017 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..ebad1fd 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-2017 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..e559474 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-2017 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..cd4cb71 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-2017 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..6c65bb1 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-2017 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..08aeec3 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-2017 Markus Franz Xaver Johannes Oberhumer ; All Rights Reserved. ; ; The LZO library is free software; you can redistribute it and/or |