The updated lz4 library removed the #ifdef guards around the various EXPORT_SYMBOL statements in the original kernel lz4 support, which broke CONFIG_KERNEL_LZ4 on x86:
x86_64-linux-ld: -r and -pie may not be used together scripts/Makefile.build:308: recipe for target 'arch/x86/boot/compressed/misc.o' failed This uses a simpler way to do the same thing, by overriding the EXPORT_SYMBOL macro. Signed-off-by: Arnd Bergmann <a...@arndb.de> --- lib/lz4/lz4_decompress.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c index 9bf918233749..a390f63bc475 100644 --- a/lib/lz4/lz4_decompress.c +++ b/lib/lz4/lz4_decompress.c @@ -40,6 +40,11 @@ #include <linux/kernel.h> #include <asm/unaligned.h> +#ifdef STATIC +#undef EXPORT_SYMBOL +#define EXPORT_SYMBOL(x) +#endif + /*-***************************** * Decompression functions *******************************/ -- 2.9.0
