diff options
| author | Yann Collet <cyan@fb.com> | 2016-11-19 01:54:26 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2016-11-19 01:56:56 (GMT) |
| commit | 19df3029e234e4c48c31377c9ef5f7c940da5106 (patch) | |
| tree | 3ee2bd09200f75f321b98a2ddc60f1aaa2343347 | |
| parent | 519932afaf5a1d85e5d39de4acebc0a6bc07b9e3 (diff) | |
| download | lz4-19df3029e234e4c48c31377c9ef5f7c940da5106.zip lz4-19df3029e234e4c48c31377c9ef5f7c940da5106.tar.gz lz4-19df3029e234e4c48c31377c9ef5f7c940da5106.tar.bz2 | |
fixed #272 (compilation fails on gcc 4.4), reported by @totaam
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/lz4.h | 5 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
6 files changed, 14 insertions, 6 deletions
@@ -51,7 +51,7 @@ endif .PHONY: default all lib lz4 clean test versionsTest examples -default: lib lz4 +default: lib lz4-release all: @$(MAKE) -C $(LZ4DIR) $@ @@ -62,6 +62,10 @@ lib: @$(MAKE) -C $(LZ4DIR) lz4: + @$(MAKE) -C $(PRGDIR) $@ + @cp $(PRGDIR)/lz4$(EXT) . + +lz4-release: @$(MAKE) -C $(PRGDIR) @cp $(PRGDIR)/lz4$(EXT) . @@ -1,6 +1,7 @@ v1.7.4 Improved : much better speed in -mx32 mode cli : fix : Large file support in 32-bits mode on Mac OS-X +fix : compilation on gcc 4.4 (#282), reported by Antoine Martin v1.7.3 Changed : moved to versioning; package, cli and library have same version number @@ -70,6 +70,8 @@ in single-thread mode. [zlib]: http://www.zlib.net/ [Zstandard]: http://www.zstd.net/ +LZ4 is also compatible and well optimized for x32 mode, for which it provides +10% speed performance. + Documentation ------------------------- diff --git a/lib/Makefile b/lib/Makefile index 216d136..d6e3668 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -46,7 +46,7 @@ DESTDIR?= PREFIX ?= /usr/local CPPFLAGS= -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 -CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ +CFLAGS += -g -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \ -Wpointer-arith -Wstrict-aliasing=1 CFLAGS += $(MOREFLAGS) @@ -102,7 +102,7 @@ else endif clean: - @$(RM) core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc dll/liblz4.dll dll/liblz4.lib + @$(RM) core *.o *.a *.$(SHARED_EXT) liblz4.pc dll/liblz4.dll dll/liblz4.lib @echo Cleaning library completed @@ -412,9 +412,10 @@ union LZ4_streamDecode_u { #ifdef LZ4_DISABLE_DEPRECATE_WARNINGS # define LZ4_DEPRECATED(message) /* disable deprecation warnings */ #else -# if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) +# define LZ4_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +# if (LZ4_GCC_VERSION >= 405) || defined(__clang__) # define LZ4_DEPRECATED(message) __attribute__((deprecated(message))) -# elif defined(__GNUC__) && (__GNUC__ >= 3) +# elif (LZ4_GCC_VERSION >= 301) # define LZ4_DEPRECATED(message) __attribute__((deprecated)) # elif defined(_MSC_VER) # define LZ4_DEPRECATED(message) __declspec(deprecated(message)) diff --git a/tests/Makefile b/tests/Makefile index 288b665..e58d449 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -39,7 +39,7 @@ TESTDIR := versionsTest PYTHON ?= python3 CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make -CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum \ +CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum \ -Wdeclaration-after-statement -Wstrict-prototypes \ -Wpointer-arith -Wstrict-aliasing=1 CFLAGS += $(MOREFLAGS) |