From 7b15b8d18c7731069b2687a7f466a438c6536754 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Sun, 23 Aug 2020 14:13:34 -0400 Subject: [PATCH] libzstd: Don't warn about stack frame size in userspace With the current way CFLAGS are modified in libzstd, CFLAGS passed on the make command line will cause the CFLAGS in the Makefile for zstd.c to be discarded, but not AM_CFLAGS. This causes a smaller frame size limit to be used, and the build fails. We don't need to worry about stack frame sizes in userspace. Drop the extra flags. Reviewed-by: Kjeld Schouten Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10773 --- lib/libzstd/Makefile.am | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/libzstd/Makefile.am b/lib/libzstd/Makefile.am index 7e92ffb689..7c7035c411 100644 --- a/lib/libzstd/Makefile.am +++ b/lib/libzstd/Makefile.am @@ -2,8 +2,9 @@ include $(top_srcdir)/config/Rules.am VPATH = $(top_srcdir)/module/zstd -# Includes kernel code, generate warnings for large stack frames -AM_CFLAGS += $(FRAME_LARGER_THAN) +# -fno-tree-vectorize is set for gcc in zstd/common/compiler.h +# Set it for other compilers, too. +AM_CFLAGS += -fno-tree-vectorize noinst_LTLIBRARIES = libzstd.la @@ -12,12 +13,3 @@ KERNEL_C = \ zfs_zstd.c nodist_libzstd_la_SOURCES = $(KERNEL_C) - -# -fno-tree-vectorize is set for gcc in zstd/common/compiler.h -# Set it for other compilers, too. -lib/zstd.$(OBJEXT): CFLAGS += -fno-tree-vectorize -lib/zstd.l$(OBJEXT): CFLAGS += -fno-tree-vectorize - -# Quiet warnings about frame size due to unused code in unmodified zstd lib -lib/zstd.$(OBJEXT): CFLAGS += -Wframe-larger-than=20480 -lib/zstd.l$(OBJEXT): CFLAGS += -Wframe-larger-than=20480