Skip to content

Commit b4de11d

Browse files
Tom Rixmartinkpetersen
authored andcommitted
scsi: aic7xxx: Remove multiple definition of globals
Building aicasm with gcc 10.2 + gas 26.1 causes 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 it. yylineno is defined by flex, so defining it in bison/*.y file is not needed. Also delete this. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Tom Rix <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7e76063 commit b4de11d

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/scsi/aic7xxx/aicasm/aicasm_gram.y

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#include "aicasm_symbol.h"
5959
#include "aicasm_insformat.h"
6060

61-
int yylineno;
6261
char *yyfilename;
6362
char stock_prefix[] = "aic_";
6463
char *prefix = stock_prefix;

drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct macro_arg {
108108
regex_t arg_regex;
109109
char *replacement_text;
110110
};
111-
STAILQ_HEAD(macro_arg_list, macro_arg) args;
111+
STAILQ_HEAD(macro_arg_list, macro_arg);
112112

113113
struct macro_info {
114114
struct macro_arg_list args;

0 commit comments

Comments
 (0)