diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-07-27 11:44:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 11:44:39 -0400 |
| commit | d335feeff824b3313864096e8cefc5fbcb1df10f (patch) | |
| tree | 1153c28aac9922cd3bf15b9606c263007c176797 | |
| parent | 528d3d87bf1a4fe201bd07c1e83d39637c62417b (diff) | |
| parent | 3d3ed1afb2cff65f0986ae6b9bc69f9ae1b372e1 (diff) | |
Merge pull request #11682 from opensourcerouting/frr-format-gcc-12
tools/gcc-plugins: make GCC 12 compatible
| -rw-r--r-- | tools/gcc-plugins/frr-format.c | 2 | ||||
| -rw-r--r-- | tools/gcc-plugins/gcc-common.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/gcc-plugins/frr-format.c b/tools/gcc-plugins/frr-format.c index e9f397f225..0a24b091a3 100644 --- a/tools/gcc-plugins/frr-format.c +++ b/tools/gcc-plugins/frr-format.c @@ -1042,7 +1042,7 @@ check_format_info (function_format_info *info, tree params, format_ctx.arglocs = arglocs; check_function_arguments_recurse (check_format_arg, &format_ctx, - format_tree, arg_num); + format_tree, arg_num, OPT_Wformat_); location_t loc = format_ctx.res->format_string_loc; diff --git a/tools/gcc-plugins/gcc-common.h b/tools/gcc-plugins/gcc-common.h index ec45de1a53..9f59447d63 100644 --- a/tools/gcc-plugins/gcc-common.h +++ b/tools/gcc-plugins/gcc-common.h @@ -982,4 +982,9 @@ static inline void debug_gimple_stmt(const_gimple s) #define SET_DECL_MODE(decl, mode) DECL_MODE(decl) = (mode) #endif +#if BUILDING_GCC_VERSION < 12000 +#define check_function_arguments_recurse(arg, ctx, tree, num, opt) \ + check_function_arguments_recurse(arg, ctx, tree, num) +#endif + #endif |