X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile;h=39d1d77bfa4afb19f9e272159eae1a545da414cd;hb=d5238ad71140b0222aa805382c679599b2c91025;hp=12f6db79029f0afcfb0c9833cc9cb9ed720f02bd;hpb=87b971d0cc7c4b72eb45919bc74ca389832e5ea1;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/Makefile b/Makefile index 12f6db7..39d1d77 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ # abort - call abort() on first error (dumps core) # all - shortcut for all of the above # asan - enable address sanitizer compiler feature +# tsan - enable thread sanitizer compiler feature # ubsan - undefined behaviour sanitizer compiler feature # bcheck - extended build checks # W=123 build with warnings (default: off) @@ -54,10 +55,17 @@ DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3 DEBUG_CFLAGS_INTERNAL = DEBUG_CFLAGS := -TOPDIR := $(shell pwd) +DEBUG_LDFLAGS_DEFAULT = +DEBUG_LDFLAGS_INTERNAL = +DEBUG_LDFLAGS := + +ABSTOPDIR = $(shell pwd) +TOPDIR := . # Common build flags +CSTD = -std=gnu90 CFLAGS = $(SUBST_CFLAGS) \ + $(CSTD) \ -include config.h \ -DBTRFS_FLAT_INCLUDES \ -D_XOPEN_SOURCE=700 \ @@ -70,7 +78,9 @@ CFLAGS = $(SUBST_CFLAGS) \ $(EXTRA_CFLAGS) LDFLAGS = $(SUBST_LDFLAGS) \ - -rdynamic -L$(TOPDIR) $(EXTRA_LDFLAGS) + -rdynamic -L$(TOPDIR) \ + $(DEBUG_LDFLAGS_INTERNAL) \ + $(EXTRA_LDFLAGS) LIBS = $(LIBS_BASE) LIBBTRFS_LIBS = $(LIBS_BASE) @@ -83,38 +93,40 @@ STATIC_LIBS = $(STATIC_LIBS_BASE) # 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. +# Note: additional flags might get added per-target later 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 \ extent-cache.o extent_io.o volumes.o utils.o repair.o \ - qgroup.o raid56.o free-space-cache.o kernel-lib/list_sort.o props.o \ + qgroup.o free-space-cache.o kernel-lib/list_sort.o props.o \ kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \ inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \ - fsfeatures.o messages.o + fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ - cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ + cmds-quota.o cmds-qgroup.o cmds-replace.o check/main.o \ cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \ cmds-property.o cmds-fi-usage.o cmds-inspect-dump-tree.o \ cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o \ - mkfs/common.o + mkfs/common.o check/mode-common.o check/mode-lowmem.o libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ - kernel-lib/crc32c.o \ + kernel-lib/crc32c.o messages.o \ uuid-tree.o utils-lib.o rbtree-utils.o libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \ - kernel-lib/radix-tree.h kernel-lib/sizes.h extent-cache.h \ - extent_io.h ioctl.h ctree.h btrfsck.h version.h + kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \ + extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h convert_objects = convert/main.o convert/common.o convert/source-fs.o \ - convert/source-ext2.o -mkfs_objects = mkfs/main.o mkfs/common.o - -TESTS = fsck-tests.sh convert-tests.sh + convert/source-ext2.o convert/source-reiserfs.o +mkfs_objects = mkfs/main.o mkfs/common.o mkfs/rootdir.o +image_objects = image/main.o image/sanitize.o +all_objects = $(objects) $(cmds_objects) $(libbtrfs_objects) $(convert_objects) \ + $(mkfs_objects) $(image_objects) udev_rules = 64-btrfs-dm.rules @@ -133,6 +145,7 @@ endif ifeq ("$(origin D)", "command line") DEBUG_CFLAGS_INTERNAL = $(DEBUG_CFLAGS_DEFAULT) $(DEBUG_CFLAGS) + DEBUG_LDFLAGS_INTERNAL = $(DEBUG_LDFLAGS_DEFAULT) $(DEBUG_LDFLAGS) endif ifneq (,$(findstring verbose,$(D))) @@ -155,10 +168,17 @@ endif ifneq (,$(findstring asan,$(D))) DEBUG_CFLAGS_INTERNAL += -fsanitize=address + DEBUG_LDFLAGS_INTERNAL += -fsanitize=address -lasan +endif + +ifneq (,$(findstring tsan,$(D))) + DEBUG_CFLAGS_INTERNAL += -fsanitize=thread -fPIC + DEBUG_LDFLAGS_INTERNAL += -fsanitize=thread -ltsan -pie endif ifneq (,$(findstring ubsan,$(D))) DEBUG_CFLAGS_INTERNAL += -fsanitize=undefined + DEBUG_LDFLAGS_INTERNAL += -fsanitize=undefined -lubsan endif ifneq (,$(findstring bcheck,$(D))) @@ -188,13 +208,17 @@ endif # external libs required by various binaries; for btrfs-foo, # specify btrfs_foo_libs = ; see $($(subst...)) rules below btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2) +btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS) btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype btrfs_debug_tree_objects = cmds-inspect-dump-tree.o btrfs_show_super_objects = cmds-inspect-dump-super.o btrfs_calc_size_objects = cmds-inspect-tree-stats.o +cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD) + +CHECKER_FLAGS += $(btrfs_convert_cflags) # collect values of the variables above -standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs)))),$($(dep))) +standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs) $(progs_extra)))),$($(dep))) SUBDIRS = BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) @@ -220,6 +244,7 @@ static_cmds_objects = $(patsubst %.o, %.static.o, $(cmds_objects)) static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects)) static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects)) static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects)) +static_image_objects = $(patsubst %.o, %.static.o, $(image_objects)) libs_shared = libbtrfs.so.0.1 libs_static = libbtrfs.a @@ -238,13 +263,14 @@ ifdef C grep -v __SIZE_TYPE__ > $(check_defs)) check = $(CHECKER) check_echo = echo + CSTD = -std=gnu89 else check = true check_echo = true endif %.o.d: %.c - $(Q)$(CC) -MD -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $< + $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $< # # Pick from per-file variables, btrfs_*_cflags @@ -272,11 +298,12 @@ test-convert: btrfs btrfs-convert $(Q)bash tests/convert-tests.sh test-check: test-fsck -test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs +test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune @echo " [TEST] fsck-tests.sh" $(Q)bash tests/fsck-tests.sh -test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune +test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum \ + btrfs-zero-log btrfs-find-root btrfs-select-super btrfs-convert @echo " [TEST] misc-tests.sh" $(Q)bash tests/misc-tests.sh @@ -284,11 +311,11 @@ test-mkfs: btrfs mkfs.btrfs @echo " [TEST] mkfs-tests.sh" $(Q)bash tests/mkfs-tests.sh -test-fuzz: btrfs +test-fuzz: btrfs btrfs-image @echo " [TEST] fuzz-tests.sh" $(Q)bash tests/fuzz-tests.sh -test-cli: btrfs +test-cli: btrfs mkfs.btrfs @echo " [TEST] cli-tests.sh" $(Q)bash tests/cli-tests.sh @@ -310,10 +337,20 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli # static: $(progs_static) -version.h: version.sh version.h.in configure.ac +version.h: version.h.in configure.ac @echo " [SH] $@" $(Q)bash ./config.status --silent $@ +mktables: kernel-lib/mktables.c + @echo " [CC] $@" + $(Q)$(CC) $(CFLAGS) $< -o $@ + +# the target can be regenerated manually using mktables, but a local copy is +# kept so the build process is simpler +kernel-lib/tables.c: + @echo " [TABLE] $@" + $(Q)./mktables > $@ || ($(RM) -f $@ && exit 1) + libbtrfs: $(libs_shared) $(lib_links) $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h @@ -341,25 +378,25 @@ $(lib_links): btrfs-%.static: btrfs-%.static.o $(static_objects) $(patsubst %.o,%.static.o,$(standalone_deps)) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $@.o $(static_objects) \ + $(Q)$(CC) -o $@ $@.o $(static_objects) \ $(patsubst %.o, %.static.o, $($(subst -,_,$(subst .static,,$@)-objects))) \ $(static_libbtrfs_objects) $(STATIC_LDFLAGS) \ $($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS) btrfs-%: btrfs-%.o $(objects) $(standalone_deps) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $(objects) $@.o \ + $(Q)$(CC) -o $@ $(objects) $@.o \ $($(subst -,_,$@-objects)) \ $(libs_static) \ $(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs)) btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck' btrfsck: btrfs @@ -372,43 +409,43 @@ btrfsck.static: btrfs.static mkfs.btrfs: $(mkfs_objects) $(objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) mkfs.btrfs.static: $(static_mkfs_objects) $(static_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) btrfstune: btrfstune.o $(objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) btrfstune.static: btrfstune.static.o $(static_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) -btrfs-image: image/main.o $(objects) $(libs_static) +btrfs-image: $(image_objects) $(objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) -btrfs-image.static: image/main.static.o $(static_objects) $(static_libbtrfs_objects) +btrfs-image.static: $(static_image_objects) $(static_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) btrfs-convert: $(convert_objects) $(objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS) btrfs-convert.static: $(static_convert_objects) $(static_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS) + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS) dir-test: dir-test.o $(objects) $(libs) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) quick-test: quick-test.o $(objects) $(libs) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) ioctl-test.o: ioctl-test.c ioctl.h kerncompat.h ctree.h @echo " [CC] $@" @@ -430,13 +467,13 @@ ioctl-test: ioctl-test.o ioctl-test-32: ioctl-test-32.o @echo " [LD32] $@" - $(Q)$(CC) $(CFLAGS) -m32 -o $@ $< $(LDFLAGS) + $(Q)$(CC) -m32 -o $@ $< $(LDFLAGS) @echo " ?[PAHOLE] $@.pahole" -$(Q)pahole $@ > $@.pahole ioctl-test-64: ioctl-test-64.o @echo " [LD64] $@" - $(Q)$(CC) $(CFLAGS) -m64 -o $@ $< $(LDFLAGS) + $(Q)$(CC) -m64 -o $@ $< $(LDFLAGS) @echo " ?[PAHOLE] $@.pahole" -$(Q)pahole $@ > $@.pahole @@ -446,17 +483,29 @@ test-ioctl: ioctl-test ioctl-test-32 ioctl-test-64 $(Q)./ioctl-test-32 > ioctl-test-32.log $(Q)./ioctl-test-64 > ioctl-test-64.log -library-test: library-test.o messages.o $(libs_shared) - @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -Wl,-rpath=$(TOPDIR) -lbtrfs - @echo " [TEST] $@" - $(Q)./$@ - -library-test.static: library-test.static.o messages.static.o $(libs_static) +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 $(ABSTOPDIR)/,$^) -Wl,-rpath=$(ABSTOPDIR) -lbtrfs + @echo " [TEST RUN] $@" + $(Q)cd $(TMPD) && ./$@ + @echo " [TEST CLEAN] $@" + $(Q)$(RM) -rf -- $(TMPD) + +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 $(ABSTOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS) + @echo " [TEST RUN] $@" + $(Q)cd $(TMPD) && ./$@ + @echo " [TEST CLEAN] $@" + $(Q)$(RM) -rf -- $(TMPD) + +fssum: tests/fssum.c tests/sha224-256.c @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(libs_static) $(STATIC_LIBS) - @echo " [TEST] $@" - $(Q)./$@ + $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) test-build: test-build-pre test-build-real @@ -490,11 +539,12 @@ clean: $(CLEANDIRS) @echo "Cleaning" $(Q)$(RM) -f -- $(progs) *.o *.o.d \ kernel-lib/*.o kernel-lib/*.o.d \ + kernel-shared/*.o kernel-shared/*.o.d \ image/*.o image/*.o.d \ convert/*.o convert/*.o.d \ - mkfs/*.o mkfs/*.o.d \ + mkfs/*.o mkfs/*.o.d check/*.o check/*.o.d \ dir-test ioctl-test quick-test library-test library-test-static \ - btrfs.static mkfs.btrfs.static \ + mktables btrfs.static mkfs.btrfs.static fssum \ $(check_defs) \ $(libs) $(lib_links) \ $(progs_static) $(progs_extra) @@ -550,5 +600,5 @@ uninstall: cd $(DESTDIR)$(bindir); $(RM) -f -- btrfsck fsck.btrfs $(progs_install) ifneq ($(MAKECMDGOALS),clean) --include $(objects:.o=.o.d) $(cmds_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) +-include $(all_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) endif