From 98399ed51045871f8d73599322b6947d6b2b80d0 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 10 Aug 2015 13:51:40 +0200 Subject: Update lzo to 2.09 --- main/lzo/asm/i386/src_gas/all/asm_all.S | 44 ++++++++++++++++++++++++-------- main/lzo/asm/i386/src_gas/asminit.def | 45 +++++++++++++++++++++++++-------- main/lzo/asm/i386/src_gas/lzo1c_s1.S | 2 +- main/lzo/asm/i386/src_gas/lzo1f_f1.S | 2 +- main/lzo/asm/i386/src_gas/lzo1x_f1.S | 2 +- main/lzo/asm/i386/src_gas/lzo1x_s1.S | 2 +- main/lzo/asm/i386/src_gas/lzo1y_f1.S | 2 +- main/lzo/asm/i386/src_gas/lzo1y_s1.S | 2 +- 8 files changed, 75 insertions(+), 26 deletions(-) (limited to 'main/lzo/asm/i386/src_gas') diff --git a/main/lzo/asm/i386/src_gas/all/asm_all.S b/main/lzo/asm/i386/src_gas/all/asm_all.S index 6da894b2..730ed07a 100644 --- a/main/lzo/asm/i386/src_gas/all/asm_all.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/asminit.def b/main/lzo/asm/i386/src_gas/asminit.def index 1115582f..257190d0 100644 --- a/main/lzo/asm/i386/src_gas/asminit.def +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1c_s1.S b/main/lzo/asm/i386/src_gas/lzo1c_s1.S index c21ef485..4f15ca8f 100644 --- a/main/lzo/asm/i386/src_gas/lzo1c_s1.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1f_f1.S b/main/lzo/asm/i386/src_gas/lzo1f_f1.S index eec8c8a6..a2c3c4e4 100644 --- a/main/lzo/asm/i386/src_gas/lzo1f_f1.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1x_f1.S b/main/lzo/asm/i386/src_gas/lzo1x_f1.S index 87ef8d7d..8e2bcc9e 100644 --- a/main/lzo/asm/i386/src_gas/lzo1x_f1.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1x_s1.S b/main/lzo/asm/i386/src_gas/lzo1x_s1.S index 69523a73..ed43092b 100644 --- a/main/lzo/asm/i386/src_gas/lzo1x_s1.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1y_f1.S b/main/lzo/asm/i386/src_gas/lzo1y_f1.S index cfc59937..32ee007a 100644 --- a/main/lzo/asm/i386/src_gas/lzo1y_f1.S +++ b/main/lzo/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/main/lzo/asm/i386/src_gas/lzo1y_s1.S b/main/lzo/asm/i386/src_gas/lzo1y_s1.S index b7900ca6..6a52bbbc 100644 --- a/main/lzo/asm/i386/src_gas/lzo1y_s1.S +++ b/main/lzo/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 -- cgit v1.2.3