From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0110CC433ED for ; Mon, 17 May 2021 20:51:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD6FE611EE for ; Mon, 17 May 2021 20:51:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237240AbhEQUw0 (ORCPT ); Mon, 17 May 2021 16:52:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44491 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237136AbhEQUwY (ORCPT ); Mon, 17 May 2021 16:52:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621284667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qidodmYtOq/bVdiDmZy2oVcc1WKBd5gvipIegl/6mHQ=; b=MYHCzUDEscONzoIreK3GMTBKC6yg6C0EZuftXO6Uf2lCXEXlfdqnLRNUGcRFMysPy7VLFH vNZr8r3HZ1h6ihMNG78danHovw22GzZCNrd0Ugu/Ky1txElaEtphtKioVOYNs3AToakdVt 0mBITfZnpsIYDWM12jrT3IMJrwcapEU= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-B67_5wFQPdWISWa_bh7quQ-1; Mon, 17 May 2021 16:51:05 -0400 X-MC-Unique: B67_5wFQPdWISWa_bh7quQ-1 Received: by mail-qv1-f71.google.com with SMTP id i14-20020a0cf10e0000b02901eeced6480dso4208010qvl.4 for ; Mon, 17 May 2021 13:51:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qidodmYtOq/bVdiDmZy2oVcc1WKBd5gvipIegl/6mHQ=; b=uWLnO0Sxzqwd5LKUJVune4AolYaRhGp94PO9wPJxtOWuFe2p1XVQiRsQCuBbPklPqS duFldjohwrzDdwddzEfwrrlW300hiAXfkhRGHPtpE6fk95vCLQHVOJP7RHNuinJE1qzM MiGWF5oH/e+YxPDs9nHIbfOwP41nPDy+N5Ky+V2sRQ+h8u+A5xCCGDeSBnerwclic1nJ fGoYHh0yo/1NAN2ZYceN8awO2MCzD+LJQQyEKVcRBQqY7KNyCmfcOM7P2pftFDnmAROm X6Kot9rtrNdpwvWOr60VnAIf/cVo1cVsyEsPZgUZDP0zGUcthw0+/Dd3SNFW2gaXdeEg bh1g== X-Gm-Message-State: AOAM532OmYCkZ4dR+KPo1S4H3TUHDIPbkA2Lhnu4Ee05eE64qJVVYiIT nr2z5YYIzwbDjJilWa4681W/4afFKFgQjP7n/1InMk2r1wsfBdyqG1QDiTZE2x5Ej0EdQgvM+08 bdzOUDh/qE9i9Q2b8dPPhSIgP X-Received: by 2002:ac8:7e8c:: with SMTP id w12mr1393764qtj.384.1621284664702; Mon, 17 May 2021 13:51:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzf7r8oNdaJYHYWe0zaANVtHXBioBvnDbPzxB+JhLVOkDKrwobi/FReLeV6iQBIPNR96tGYoQ== X-Received: by 2002:ac8:7e8c:: with SMTP id w12mr1393754qtj.384.1621284664537; Mon, 17 May 2021 13:51:04 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id f1sm11227045qkl.93.2021.05.17.13.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 13:51:04 -0700 (PDT) From: trix@redhat.com To: hare@suse.com, jejb@linux.ibm.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH] [SCSI] aic7xxx: remove multiple definition of globals Date: Mon, 17 May 2021 13:50:57 -0700 Message-Id: <20210517205057.1850010-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Rix 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 --- drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 1 - drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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; -- 2.26.3