diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-12 10:27:50 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-13 11:45:23 +0200 |
| commit | c7377381f4b3d02f88a4b2bd568d24a3d4a7d399 (patch) | |
| tree | 5624fb513bc5fc7a833eec28358bb57d08f8c025 | |
| parent | bsp: Fixes due to header file changes (diff) | |
| download | rtems-c7377381f4b3d02f88a4b2bd568d24a3d4a7d399.tar.bz2 | |
xz: Use CRC32
This reverts c475924d6d2ea7d5cba160a8a28e88642d6b46d8.
Update #2909.
Close #2994.
| -rw-r--r-- | cpukit/libmisc/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/libmisc/xz/xz_config.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index dda5b996a5..d8fa47a2a5 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -195,7 +195,7 @@ libuuid_a_SOURCES = uuid/clear.c uuid/compare.c uuid/copy.c uuid/gen_uuid.c \ ## xz-embedded noinst_LIBRARIES += libxz.a -libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c xz/xz_crc64.c \ +libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c \ xz/xz_dec_lzma2.c xz/xz_dec_stream.c EXTRA_DIST += xz/README xz/COPING diff --git a/cpukit/libmisc/xz/xz_config.h b/cpukit/libmisc/xz/xz_config.h index 41faf4e69b..eb9dac1a4b 100644 --- a/cpukit/libmisc/xz/xz_config.h +++ b/cpukit/libmisc/xz/xz_config.h @@ -11,7 +11,7 @@ #define XZ_CONFIG_H /* Uncomment to enable CRC64 support. */ -#define XZ_USE_CRC64 +/* #define XZ_USE_CRC64 */ /* Uncomment as needed to enable BCJ filter decoders. */ /* #define XZ_DEC_X86 */ @@ -62,10 +62,6 @@ typedef unsigned char bool; * NOTE: System headers on GNU/Linux may #define this macro already, * so if you want to change it, you need to #undef it first. */ -#ifdef __rtems__ -# undef __always_inline -# define __always_inline inline -#else #ifndef __always_inline # ifdef __GNUC__ # define __always_inline \ @@ -74,7 +70,6 @@ typedef unsigned char bool; # define __always_inline inline # endif #endif -#endif /* Inline functions to access unaligned unsigned 32-bit integers */ #ifndef get_unaligned_le32 |