diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
| commit | 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c (patch) | |
| tree | cb33b2698e3f665546a328882c7481b11f633428 /main/lzo/asm/i386/src_gas/asminit.def | |
| parent | d3aa9f835d7fd5f53d3a0da6778d46a7067bf074 (diff) | |
Update lzo version
--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
Diffstat (limited to 'main/lzo/asm/i386/src_gas/asminit.def')
| -rw-r--r-- | main/lzo/asm/i386/src_gas/asminit.def | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/main/lzo/asm/i386/src_gas/asminit.def b/main/lzo/asm/i386/src_gas/asminit.def index 154b8a52..1115582f 100644 --- a/main/lzo/asm/i386/src_gas/asminit.def +++ b/main/lzo/asm/i386/src_gas/asminit.def @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -40,7 +25,7 @@ http://www.oberhumer.com/opensource/lzo/ */ -#if defined(__MACH__) && defined(__APPLE__) +#if (defined(__MACH__) && defined(__APPLE__)) # define NAME1(x) _ ## x #else # define NAME1(x) _ ## x @@ -67,12 +52,16 @@ # define sizef(x,s) # endif #endif -#ifndef db -# define db .byte -#endif -#ifdef __ELF__ +#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__) +p2align(6) +#else p2align(4) +#endif +#ifndef db +# define db .byte +#endif |