btrfs-progs: check: introduce repair_inode_item_missing()

[platform/upstream/btrfs-progs.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e8d932..d0657aa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,13 @@ DEBUG_LDFLAGS_DEFAULT =
 DEBUG_LDFLAGS_INTERNAL =
 DEBUG_LDFLAGS :=
 
-TOPDIR := $(shell pwd)
+ABSTOPDIR = $(shell pwd)
+TOPDIR := .
 
 # Common build flags
+CSTD = -std=gnu90
 CFLAGS = $(SUBST_CFLAGS) \
-        -std=gnu90 \
+        $(CSTD) \
         -include config.h \
         -DBTRFS_FLAT_INCLUDES \
         -D_XOPEN_SOURCE=700  \
@@ -96,7 +98,7 @@ CHECKER := sparse
 check_defs := .cc-defines.h
 CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \
        -D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef \
-       -U_FORTIFY_SOURCE
+       -U_FORTIFY_SOURCE -Wdeclaration-after-statement -Wdefault-bitfield-sign
 
 objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
          root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
@@ -262,6 +264,7 @@ ifdef C
                        grep -v __SIZE_TYPE__ > $(check_defs))
        check = $(CHECKER)
        check_echo = echo
+       CSTD = -std=gnu89
 else
        check = true
        check_echo = true
@@ -485,7 +488,7 @@ library-test: library-test.c $(libs_shared)
        @echo "    [TEST PREP]  $@"$(eval TMPD=$(shell mktemp -d))
        $(Q)mkdir -p $(TMPD)/include/btrfs && \
        cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
-       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^) -Wl,-rpath=$(TOPDIR) -lbtrfs
+       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) -Wl,-rpath=$(ABSTOPDIR) -lbtrfs
        @echo "    [TEST RUN]   $@"
        $(Q)cd $(TMPD) && ./$@
        @echo "    [TEST CLEAN] $@"
@@ -495,7 +498,7 @@ library-test.static: library-test.c $(libs_static)
        @echo "    [TEST PREP]  $@"$(eval TMPD=$(shell mktemp -d))
        $(Q)mkdir -p $(TMPD)/include/btrfs && \
        cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
-       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS)
        @echo "    [TEST RUN]   $@"
        $(Q)cd $(TMPD) && ./$@
        @echo "    [TEST CLEAN] $@"