diff mbox series

[SCSI] aic7xxx: remove multiple definition of globals

Message ID 20210517205057.1850010-1-trix@redhat.com (mailing list archive)
State Accepted
Headers show
Series [SCSI] aic7xxx: remove multiple definition of globals | expand

Commit Message

Tom Rix May 17, 2021, 8:50 p.m. UTC 
From: Tom Rix <trix@redhat.com>

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.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/scsi/aic7xxx/aicasm/aicasm_gram.y   | 1 -
 drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Martin K. Petersen May 22, 2021, 4:40 a.m. UTC | #1 
On Mon, 17 May 2021 13:50:57 -0700, trix@redhat.com 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
diff mbox series

Patch

diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index 924d55a8acbfc..65182ad9cdf82 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -58,7 +58,6 @@ 
 #include "aicasm_symbol.h"
 #include "aicasm_insformat.h"
 
-int yylineno;
 char *yyfilename;
 char stock_prefix[] = "aic_";
 char *prefix = stock_prefix;
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
index 7bf7fd5953ac9..ed3bdd43c2976 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
@@ -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;