diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-30 17:09:57 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-30 17:09:57 +0300 |
| commit | f42ee981668b545ab6d06c6072e262c29605273c (patch) | |
| tree | 3c629000a91b0b0dccf11bacdd1878cea508be73 /src/liblzma/common/common.h | |
| parent | Added a comment about "autoconf -fi" to autogen.sh. (diff) | |
| download | xz-f42ee981668b545ab6d06c6072e262c29605273c.tar.xz | |
Build system fixes
Don't use libtool convenience libraries to avoid recently
discovered long-standing subtle but somewhat severe bugs
in libtool (at least 1.5.22 and 2.2.6 are affected). It
was found when porting XZ Utils to Windows
<http://lists.gnu.org/archive/html/libtool/2009-06/msg00070.html>
but the problem is significant also e.g. on GNU/Linux.
Unless --disable-shared is passed to configure, static
library built from a set of convenience libraries will
contain PIC objects. That is, while libtool builds non-PIC
objects too, only PIC objects will be used from the
convenience libraries. On 32-bit x86 (tested on mobile XP2400+),
using PIC instead of non-PIC makes the decompressor 10 % slower
with the default CFLAGS.
So while xz was linked against static liblzma by default,
it got the slower PIC objects unless --disable-shared was
used. I tend develop and benchmark with --disable-shared
due to faster build time, so I hadn't noticed the problem
in benchmarks earlier.
This commit also adds support for building Windows resources
into liblzma and executables.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/common/common.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h index 1fd778b0..d794cb30 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -13,12 +13,16 @@ #ifndef LZMA_COMMON_H #define LZMA_COMMON_H -#include "../../common/sysdefs.h" -#include "../../common/mythread.h" -#include "../../common/integer.h" - -#if defined(DLL_EXPORT) && (defined(_WIN32) || defined(__CYGWIN__)) -# define LZMA_API_EXPORT __declspec(dllexport) +#include "sysdefs.h" +#include "mythread.h" +#include "integer.h" + +#if defined(_WIN32) || defined(__CYGWIN__) +# ifdef DLL_EXPORT +# define LZMA_API_EXPORT __declspec(dllexport) +# else +# define LZMA_API_EXPORT +# endif // Don't use ifdef or defined() below. #elif HAVE_VISIBILITY # define LZMA_API_EXPORT __attribute__((__visibility__("default"))) |