Commit b4de11df authored by Tom Rix's avatar Tom Rix Committed by Martin K. Petersen
Browse files

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/20210517205057.1850010-1-trix@redhat.com


Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7e760633

drivers/scsi/aic7xxx/aicasm/aicasm_gram.y

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;