forked from mirrors/linux
		
	perf build: Disable fewer bison warnings
If bison is version 3.8.2, reduce the number of bison C warnings disabled. Earlier bison versions have all C warnings disabled. Avoid implicit declarations of yylex by adding the declaration in the C file. A header can't be included as a circular dependency would occur due to the lexer using the bison defined tokens. Committer notes: Some recent versions of gcc and clang (noticed on Alpine Linux 3.17, edge, clearlinux, fedora 37, etc. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andrii Nakryiko <andrii@kernel.org> Cc: Eduard Zingerman <eddyz87@gmail.com> Cc: Gaosheng Cui <cuigaosheng1@huawei.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rob Herring <robh@kernel.org> Cc: Tom Rix <trix@redhat.com> Cc: bpf@vger.kernel.org Cc: llvm@lists.linux.dev Link: https://lore.kernel.org/r/20230728064917.767761-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
							parent
							
								
									10c775afa5
								
							
						
					
					
						commit
						ddc8e4c966
					
				
					 5 changed files with 17 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -306,10 +306,14 @@ CFLAGS_pmu-flex.o           += $(flex_flags)
 | 
			
		|||
CFLAGS_expr-flex.o          += $(flex_flags)
 | 
			
		||||
CFLAGS_bpf-filter-flex.o    += $(flex_flags)
 | 
			
		||||
 | 
			
		||||
bison_flags := -DYYENABLE_NLS=0
 | 
			
		||||
BISON_GE_35 := $(shell expr $(shell $(BISON) --version | grep bison | sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\)/\1\2/g') \>\= 35)
 | 
			
		||||
ifeq ($(BISON_GE_35),1)
 | 
			
		||||
  bison_flags += -Wno-unused-parameter -Wno-nested-externs -Wno-implicit-function-declaration -Wno-switch-enum -Wno-unused-but-set-variable -Wno-unknown-warning-option
 | 
			
		||||
# Some newer clang and gcc version complain about this
 | 
			
		||||
# util/parse-events-bison.c:1317:9: error: variable 'parse_events_nerrs' set but not used [-Werror,-Wunused-but-set-variable]
 | 
			
		||||
#  int yynerrs = 0;
 | 
			
		||||
 | 
			
		||||
bison_flags := -DYYENABLE_NLS=0 -Wno-unused-but-set-variable
 | 
			
		||||
BISON_GE_382 := $(shell expr $(shell $(BISON) --version | grep bison | sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \>\= 382)
 | 
			
		||||
ifeq ($(BISON_GE_382),1)
 | 
			
		||||
  bison_flags += -Wno-switch-enum
 | 
			
		||||
else
 | 
			
		||||
  bison_flags += -w
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,6 +9,8 @@
 | 
			
		|||
#include <linux/list.h>
 | 
			
		||||
#include "bpf-filter.h"
 | 
			
		||||
 | 
			
		||||
int perf_bpf_filter_lex(void);
 | 
			
		||||
 | 
			
		||||
static void perf_bpf_filter_error(struct list_head *expr __maybe_unused,
 | 
			
		||||
				  char const *msg)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,6 +7,8 @@
 | 
			
		|||
#include "util/debug.h"
 | 
			
		||||
#define IN_EXPR_Y 1
 | 
			
		||||
#include "expr.h"
 | 
			
		||||
#include "expr-bison.h"
 | 
			
		||||
int expr_lex(YYSTYPE * yylval_param , void *yyscanner);
 | 
			
		||||
%}
 | 
			
		||||
 | 
			
		||||
%define api.pure full
 | 
			
		||||
| 
						 | 
				
			
			@ -56,7 +58,7 @@
 | 
			
		|||
static void expr_error(double *final_val __maybe_unused,
 | 
			
		||||
		       struct expr_parse_ctx *ctx __maybe_unused,
 | 
			
		||||
		       bool compute_ids __maybe_unused,
 | 
			
		||||
		       void *scanner,
 | 
			
		||||
		       void *scanner __maybe_unused,
 | 
			
		||||
		       const char *s)
 | 
			
		||||
{
 | 
			
		||||
	pr_debug("%s\n", s);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,6 +20,7 @@
 | 
			
		|||
#include "parse-events.h"
 | 
			
		||||
#include "parse-events-bison.h"
 | 
			
		||||
 | 
			
		||||
int parse_events_lex(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , void *yyscanner);
 | 
			
		||||
void parse_events_error(YYLTYPE *loc, void *parse_state, void *scanner, char const *msg);
 | 
			
		||||
 | 
			
		||||
#define PE_ABORT(val) \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,6 +11,9 @@
 | 
			
		|||
#include <linux/bitmap.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include "pmu.h"
 | 
			
		||||
#include "pmu-bison.h"
 | 
			
		||||
 | 
			
		||||
int perf_pmu_lex(YYSTYPE * yylval_param , void *yyscanner);
 | 
			
		||||
 | 
			
		||||
#define ABORT_ON(val) \
 | 
			
		||||
do { \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue