diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2020-02-10 16:24:59 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-02-27 22:31:14 -0500 |
| commit | 336c440ccea8f94b0728f881cddee84f730e7cc7 (patch) | |
| tree | 29adf7a6694cd7fb346bcf96b2c743eea9b8e66d | |
| parent | a5676f8da792062f4c0e8ee49e0a5f0877268411 (diff) | |
| download | e2fsprogs-336c440ccea8f94b0728f881cddee84f730e7cc7.tar.gz | |
tst_libext2fs: Avoid multiple definition of global variables
gcc version 10 changed the default from -fcommon to -fno-common and as a
result e2fsprogs make check tests fail because tst_libext2fs.c end up
with a build error.
This is because it defines two global variables debug_prog_name and
extra_cmds that are already defined in debugfs/debugfs.c. With -fcommon
linker was able to resolve those into the same object, however with
-fno-common it's no longer able to do it and we end up with multiple
definition errors.
Fix the problem by using SKIP_GLOBDEFS macro to skip the variables
definition in debugfs.c. Note that debug_prog_name is also defined in
lib/ext2fs/extent.c when DEBUG macro is used, but this does not work even
with older gcc versions and is never used regardless so I am not going to
bother with it.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | debugfs/debugfs.c | 6 | ||||
| -rw-r--r-- | debugfs/debugfs.h | 2 | ||||
| -rw-r--r-- | lib/ext2fs/Makefile.in | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 755ec8085..e33c92ef6 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -48,8 +48,14 @@ extern char *optarg; int journal_enable_debug = -1; #endif +/* + * There must be only one definition if we're hooking in extra commands or + * chaging default prompt. Use -DSKIP_GLOBDEF for that. + */ +#ifndef SKIP_GLOBDEFS ss_request_table *extra_cmds; const char *debug_prog_name; +#endif int ss_sci_idx; ext2_filsys current_fs; diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h index 477d9bbb4..956517bcf 100644 --- a/debugfs/debugfs.h +++ b/debugfs/debugfs.h @@ -123,6 +123,8 @@ extern void do_set_block_group_descriptor(int argc, char **, int sci_idx, void * extern void do_dump_unused(int argc, char **argv, int sci_idx, void *infop); /* debugfs.c */ +extern ss_request_table *extra_cmds; +extern const char *debug_prog_name; extern void internal_dump_inode(FILE *, const char *, ext2_ino_t, struct ext2_inode *, int); diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index c2163bf56..f754b952f 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -377,7 +377,7 @@ extent_cmds.c extent_cmds.h: $(top_srcdir)/debugfs/extent_cmds.ct debugfs.o: $(top_srcdir)/debugfs/debugfs.c $(E) " CC $<" - $(Q) $(CC) $(DEBUGFS_CFLAGS) -c $< -o $@ + $(Q) $(CC) $(DEBUGFS_CFLAGS) -DSKIP_GLOBDEFS -c $< -o $@ extent_inode.o: $(top_srcdir)/debugfs/extent_inode.c $(E) " CC $<" |