btrfs-progs: get C=1 sparse checking working again
There were a few problems that were breaking sparse checking: - We were defining CHECK_ENDIAN late in the environment, after linux/fs.h has been included which defines __force and __bitwise in confusing ways that conflict with ours. Define it up with __CHECKER__ so that linux/fs.h and our copy are acting on the same input. - We had manually set a few of gcc's internal defines to give to sparse. It's easier to just ask gcc for all the defines it sets and hand those to sparse. - We weren't passing the same *FLAGS to sparse as we were to CC. - glibc has so many errors with FORTIFY turned on that sparse gives up and doesn't show us any errors from our code. It's a questionable hack to always turn on FORTIFY ourselves, so we'll just not do that when building with sparse. And add a nice '[SP]' quiet output line for sparse checks. Signed-off-by: Zach Brown <zab@redhat.com> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
parent
c17a056f38
commit
5ac75e2af2
|
@ -1,6 +1,7 @@
|
|||
*.o
|
||||
*.static.o
|
||||
*.o.d
|
||||
.cc-defines.h
|
||||
version.h
|
||||
version
|
||||
man/*.gz
|
||||
|
|
28
Makefile
28
Makefile
|
@ -1,7 +1,7 @@
|
|||
CC = gcc
|
||||
LN = ln
|
||||
AR = ar
|
||||
AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DBTRFS_FLAT_INCLUDES -fPIC
|
||||
AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -DBTRFS_FLAT_INCLUDES -fPIC
|
||||
CFLAGS = -g -O1
|
||||
objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
|
||||
root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
|
||||
|
@ -17,9 +17,6 @@ libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
|
|||
crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
|
||||
extent_io.h ioctl.h ctree.h btrfsck.h
|
||||
|
||||
CHECKFLAGS= -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise \
|
||||
-Wuninitialized -Wshadow -Wundef
|
||||
|
||||
INSTALL = install
|
||||
prefix ?= /usr/local
|
||||
bindir = $(prefix)/bin
|
||||
|
@ -70,17 +67,34 @@ lib_links = libbtrfs.so.0 libbtrfs.so
|
|||
headers = $(libbtrfs_headers)
|
||||
|
||||
# make C=1 to enable sparse
|
||||
check_defs := .cc-defines.h
|
||||
ifdef C
|
||||
check = sparse $(CHECKFLAGS)
|
||||
#
|
||||
# We're trying to use sparse against glibc headers which go wild
|
||||
# trying to use internal compiler macros to test features. We
|
||||
# copy gcc's and give them to sparse. But not __SIZE_TYPE__
|
||||
# 'cause sparse defines that one.
|
||||
#
|
||||
dummy := $(shell $(CC) -dM -E -x c - < /dev/null | \
|
||||
grep -v __SIZE_TYPE__ > $(check_defs))
|
||||
check = sparse -include $(check_defs) -D__CHECKER__ \
|
||||
-D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef
|
||||
check_echo = echo
|
||||
# don't use FORTIFY with sparse because glibc with FORTIFY can
|
||||
# generate so many sparse errors that sparse stops parsing,
|
||||
# which masks real errors that we want to see.
|
||||
else
|
||||
check = true
|
||||
check_echo = true
|
||||
AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
|
||||
endif
|
||||
|
||||
%.o.d: %.c
|
||||
$(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(AM_CFLAGS) $(CFLAGS) $<
|
||||
|
||||
.c.o:
|
||||
$(Q)$(check) $<
|
||||
@$(check_echo) " [SP] $<"
|
||||
$(Q)$(check) $(AM_CFLAGS) $(CFLAGS) $<
|
||||
@echo " [CC] $@"
|
||||
$(Q)$(CC) $(AM_CFLAGS) $(CFLAGS) -c $<
|
||||
|
||||
|
@ -189,7 +203,7 @@ clean :
|
|||
$(Q)rm -f $(progs) cscope.out *.o *.o.d btrfs-convert btrfs-image btrfs-select-super \
|
||||
btrfs-zero-log btrfstune dir-test ioctl-test quick-test send-test btrfsck \
|
||||
btrfs.static mkfs.btrfs.static btrfs-calc-size \
|
||||
version.h \
|
||||
version.h $(check_defs) \
|
||||
$(libs) $(lib_links)
|
||||
$(Q)$(MAKE) $(MAKEOPTS) -C man $@
|
||||
|
||||
|
|
|
@ -241,7 +241,6 @@ static inline long IS_ERR(const void *ptr)
|
|||
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type,member) );})
|
||||
#ifdef __CHECKER__
|
||||
#define __CHECK_ENDIAN__
|
||||
#define __bitwise __bitwise__
|
||||
#else
|
||||
#define __bitwise
|
||||
|
|
Loading…
Reference in New Issue