diff options
Diffstat (limited to 'asm')
48 files changed, 102 insertions, 58 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 fbfc9b8..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-2015 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/leave.ash b/asm/i386/src/leave.ash index 209e2bb..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-2015 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/lzo1c_d.ash b/asm/i386/src/lzo1c_d.ash index d373ed2..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-2015 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/lzo1c_s1.S b/asm/i386/src/lzo1c_s1.S index 2de4463..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-2015 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/lzo1f_d.ash b/asm/i386/src/lzo1f_d.ash index edbe0a6..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-2015 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/lzo1f_f1.S b/asm/i386/src/lzo1f_f1.S index b77c894..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-2015 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/lzo1x_d.ash b/asm/i386/src/lzo1x_d.ash index 35d1ca4..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-2015 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/lzo1x_f1.S b/asm/i386/src/lzo1x_f1.S index 2081052..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-2015 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/lzo1x_s1.S b/asm/i386/src/lzo1x_s1.S index c034d7a..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-2015 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/lzo1y_f1.S b/asm/i386/src/lzo1y_f1.S index 2fbd022..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-2015 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/lzo1y_s1.S b/asm/i386/src/lzo1y_s1.S index 245a8f7..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-2015 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/lzo_asm.h b/asm/i386/src/lzo_asm.h index 538b408..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-2015 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/all/asm_all.S b/asm/i386/src_gas/all/asm_all.S index 730ed07..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-2015 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,17 +27,31 @@ /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/ +#undef _ #ifndef NAME1 -#if (defined(__MACH__) && defined(__APPLE__)) +#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(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(a) .p2align a #endif @@ -50,38 +64,38 @@ # elif (defined(__MACH__) && defined(__APPLE__)) # define hiddenf(a) .private_extern a # else -# define hiddenf(a) +# define hiddenf(a) # endif #endif #ifndef typef # if defined(__ELF__) # define typef(a) .type a,@function # else -# define typef(a) +# define typef(a) # endif #endif #ifndef sizef # if defined(__ELF__) # define sizef(a,b) .size a,b # else -# define sizef(a,b) +# 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(_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(__WIN32__) || defined(_WIN64) || defined(__WIN64__) +#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 257190d..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-2015 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,18 +25,32 @@ http://www.oberhumer.com/opensource/lzo/ */ +#undef _ #ifndef NAME1 -#if (defined(__MACH__) && defined(__APPLE__)) +#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(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(a) .p2align a @@ -50,21 +64,21 @@ # elif (defined(__MACH__) && defined(__APPLE__)) # define hiddenf(a) .private_extern a # else -# define hiddenf(a) +# define hiddenf(a) /*empty*/ # endif #endif #ifndef typef # if defined(__ELF__) # define typef(a) .type a,@function # else -# define typef(a) +# define typef(a) /*empty*/ # endif #endif #ifndef sizef # if defined(__ELF__) # define sizef(a,b) .size a,b # else -# define sizef(a,b) +# define sizef(a,b) /*empty*/ # endif #endif @@ -72,17 +86,17 @@ .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(_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(__WIN32__) || defined(_WIN64) || defined(__WIN64__) +#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 4f15ca8..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-2015 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 a2c3c4e..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-2015 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 8e2bcc9..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-2015 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 ed43092..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-2015 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 32ee007..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-2015 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 6a52bbb..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-2015 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 bda48d4..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-2015 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 749eb9b..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-2015 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 f9418df..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-2015 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 ec51f0b..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-2015 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 efe2f04..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-2015 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 1c31acc..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-2015 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 f111ccb..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-2015 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 c777948..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-2015 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 f453e62..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-2015 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 @@ -50,10 +50,18 @@ bits 32 %endif %endif %ifndef NAME1 -%ifidni __OUTPUT_FORMAT__,macho32 +%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(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win32 +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win64 +%define NAME1(a) a %else %define NAME1(a) _ %+ a %define NAME2(a) a diff --git a/asm/i386/src_nasm/asminit.def b/asm/i386/src_nasm/asminit.def index 773cf99..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-2015 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,10 +49,18 @@ bits 32 %endif %ifndef NAME1 -%ifidni __OUTPUT_FORMAT__,macho32 +%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(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win32 +%define NAME1(a) _ %+ a +%elifidni __OUTPUT_FORMAT__,win64 +%define NAME1(a) a %else %define NAME1(a) _ %+ a %define NAME2(a) a diff --git a/asm/i386/src_nasm/lzo1c_s1.asm b/asm/i386/src_nasm/lzo1c_s1.asm index 982b474..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-2015 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 ccf37ed..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-2015 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 e269caa..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-2015 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 ad054be..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-2015 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 ddd55fb..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-2015 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 ce88004..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-2015 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 |