diff options
| author | Quentin Monnet <quentin.monnet@netronome.com> | 2019-08-15 16:32:20 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-08-16 07:06:46 +0200 |
| commit | 8918dc42dc85ba6981028f65a989c478eb80bc02 (patch) | |
| tree | fb4d3e3897a5731d4d7bf7a856eb8dc197157c62 /tools/include | |
| parent | tools: bpftool: fix format string for p_err() in detect_common_prefix() (diff) | |
| download | linux-8918dc42dc85ba6981028f65a989c478eb80bc02.tar.xz linux-8918dc42dc85ba6981028f65a989c478eb80bc02.zip | |
tools: bpftool: move "__printf()" attributes to header file
Some functions in bpftool have a "__printf()" format attributes to tell
the compiler they should expect printf()-like arguments. But because
these attributes are not used for the function prototypes in the header
files, the compiler does not run the checks everywhere the functions are
used, and some mistakes on format string and corresponding arguments
slipped in over time.
Let's move the __printf() attributes to the correct places.
Note: We add guards around the definition of GCC_VERSION in
tools/include/linux/compiler-gcc.h to prevent a conflict in jit_disasm.c
on GCC_VERSION from headers pulled via libbfd.
Fixes: c101189bc968 ("tools: bpftool: fix -Wmissing declaration warnings")
Reported-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/linux/compiler-gcc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/include/linux/compiler-gcc.h b/tools/include/linux/compiler-gcc.h index 0d35f18006a1..95c072b70d0e 100644 --- a/tools/include/linux/compiler-gcc.h +++ b/tools/include/linux/compiler-gcc.h @@ -6,9 +6,11 @@ /* * Common definitions for all gcc versions go here. */ +#ifndef GCC_VERSION #define GCC_VERSION (__GNUC__ * 10000 \ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) +#endif #if GCC_VERSION >= 70000 && !defined(__CHECKER__) # define __fallthrough __attribute__ ((fallthrough)) |