Skip to contentSkip to conversation

aic7xxx: remove multiple definition of globals

PATCH Applied [email protected] 2 participants 2 messages May 17, 2021 – May 22, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 aic7xxx: remove multiple definition of globals

From: Tom Rix <[email protected]>

When building the aicasm with gcc 10.2 + gas 26.1 Multiple definitions of global variables cause these errors.

multiple definition of `args';
multiple definition of `yylineno';

args came from the expansion of
STAILQ_HEAD(macro_arg_list, macro_arg) args;

The definition of the macro_arg_list structure is needed. The global variable 'args' is not, so delete.

yylineno is defined by flex, so defining it in bison/*.y file is not needed, so delete.

---
 drivers/scsi/aic7xxx/aicasm/aicasm_gram.y   | 1 -
 drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aic7xxx/aicasm/aicasm_gram.y +0 -1
index 924d55a8acbfc..65182ad9cdf82 100644
@@ -58,7 +58,6 @@
 #include "aicasm_symbol.h"
 #include "aicasm_insformat.h"
 
-int yylineno;
 char *yyfilename;
 char stock_prefix[] = "aic_";
 char *prefix = stock_prefix;
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h +1 -1
index 7bf7fd5953ac9..ed3bdd43c2976 100644
@@ -108,7 +108,7 @@ struct macro_arg {
 	regex_t	arg_regex;
 	char   *replacement_text;
 };
-STAILQ_HEAD(macro_arg_list, macro_arg) args;
+STAILQ_HEAD(macro_arg_list, macro_arg);
 
 struct macro_info {
 	struct macro_arg_list args;
Signature · 1 line
2.26.3
#1 lore raw
Quoted 10 lines · On Mon, 17 May 2021 13:50:57 -0700, [email protected] wrote:

When building the aicasm with gcc 10.2 + gas 26.1 Multiple definitions of global variables cause these errors.

multiple definition of `args';
multiple definition of `yylineno';

args came from the expansion of
STAILQ_HEAD(macro_arg_list, macro_arg) args;

[...]

Applied to 5.13/scsi-fixes, thanks!

[1/1] aic7xxx: remove multiple definition of globals

      https://git.kernel.org/mkp/scsi/c/b4de11dfb569
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering