mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2024-11-27 20:14:46 +08:00
e2fsprogs: add (optional) sparse checking to the build
Run sparse against source files when building e2fsprogs with 'make C=1'. If instead C=2, it configures basic ext2 types for bitwise checking with sparse, which can help find the (many many) spots where conversion errors are (possibly) happening. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
6c327e9ca4
commit
832cb612f8
13
Makefile.in
13
Makefile.in
@ -5,6 +5,19 @@ top_builddir = .
|
||||
my_dir = .
|
||||
INSTALL = @INSTALL@
|
||||
|
||||
CHECK=sparse
|
||||
CHECK_OPTS=-Wsparse-all -Wno-transparent-union -Wno-return-void -Wno-undef -Wno-non-pointer-null
|
||||
ifeq ("$(C)", "2")
|
||||
CHECK_CMD=$(CHECK) $(CHECK_OPTS) -Wbitwise -D__CHECK_ENDIAN__
|
||||
else
|
||||
ifeq ("$(C)", "1")
|
||||
CHECK_CMD=$(CHECK) $(CHECK_OPTS)
|
||||
else
|
||||
CHECK_CMD=@true
|
||||
endif
|
||||
endif
|
||||
export CHECK_CMD
|
||||
|
||||
@MCONFIG@
|
||||
|
||||
% : %.sh
|
||||
|
@ -44,6 +44,7 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBSS) \
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
all:: $(PROGS) $(MANPAGES)
|
||||
|
||||
|
@ -38,6 +38,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
|
||||
#
|
||||
|
@ -33,6 +33,7 @@ DOCS= doc/ext2ed-design.pdf doc/user-guide.pdf doc/ext2fs-overview.pdf \
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
.SUFFIXES: .sgml .ps .pdf .html
|
||||
|
||||
|
@ -191,6 +191,7 @@ LTV_AGE=4
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(COMPILE) $<
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
.y.c:
|
||||
$(YACC) $(YFLAGS) --output $@ $<
|
||||
|
@ -55,6 +55,7 @@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -55,6 +55,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -43,6 +43,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -200,6 +200,7 @@ all:: ext2fs.pc
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -64,14 +64,20 @@ extern "C" {
|
||||
#include <ext2fs/ext3_extents.h>
|
||||
#endif /* EXT2_FLAT_INCLUDES */
|
||||
|
||||
typedef __u32 ext2_ino_t;
|
||||
typedef __u32 blk_t;
|
||||
typedef __u64 blk64_t;
|
||||
typedef __u32 dgrp_t;
|
||||
typedef __u32 ext2_off_t;
|
||||
typedef __u64 ext2_off64_t;
|
||||
typedef __s64 e2_blkcnt_t;
|
||||
typedef __u32 ext2_dirhash_t;
|
||||
#ifdef __CHECK_ENDIAN__
|
||||
#define __bitwise __attribute__((bitwise))
|
||||
#else
|
||||
#define __bitwise
|
||||
#endif
|
||||
|
||||
typedef __u32 __bitwise ext2_ino_t;
|
||||
typedef __u32 __bitwise blk_t;
|
||||
typedef __u64 __bitwise blk64_t;
|
||||
typedef __u32 __bitwise dgrp_t;
|
||||
typedef __u32 __bitwise ext2_off_t;
|
||||
typedef __u64 __bitwise ext2_off64_t;
|
||||
typedef __s64 __bitwise e2_blkcnt_t;
|
||||
typedef __u32 __bitwise ext2_dirhash_t;
|
||||
|
||||
#if EXT2_FLAT_INCLUDES
|
||||
#include "com_err.h"
|
||||
|
@ -47,6 +47,7 @@ LIBDIR= quota
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
#ELF_CMT# $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -34,6 +34,7 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $<
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -62,6 +62,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
|
@ -100,6 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
|
||||
all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
|
||||
|
@ -38,6 +38,7 @@ DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
|
||||
|
||||
|
@ -27,6 +27,7 @@ DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
all:: $(PROGS)
|
||||
|
||||
|
@ -16,6 +16,7 @@ SRCS = $(srcdir)/subst.c
|
||||
.c.o:
|
||||
$(E) " CC $<"
|
||||
$(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
|
||||
$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
|
||||
|
||||
PROGS= subst symlinks
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user