diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-06-29 09:38:49 +0000 |
---|---|---|
committer | <> | 2015-02-03 17:12:22 +0000 |
commit | 338906b389d616a50da0447038d4ec3e1e3f190f (patch) | |
tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /asm/i386/src_gas/asminit.def | |
parent | 73a371461f818512f921941c046a3a91f5bc45b9 (diff) | |
download | lzo-338906b389d616a50da0447038d4ec3e1e3f190f.tar.gz |
Diffstat (limited to 'asm/i386/src_gas/asminit.def')
-rw-r--r-- | asm/i386/src_gas/asminit.def | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/asm/i386/src_gas/asminit.def b/asm/i386/src_gas/asminit.def index 154b8a5..1115582 100644 --- a/asm/i386/src_gas/asminit.def +++ b/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 |