From patchwork Thu Dec 8 09:18:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 1713624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=JCEsHCfq; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NSTB36rGlz23pD for ; Thu, 8 Dec 2022 20:19:23 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EA5283886A31 for ; Thu, 8 Dec 2022 09:19:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA5283886A31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670491162; bh=2y6dRPU5LYzHxjxxTL/PSFHx0tparD+bi+Y2IDPTsLk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=JCEsHCfqHvc7Asv0OGmOtowwGsLWFupABq780wWbq+P4Zr7uFSGeIfl72ezFfhN78 H+DfQybOCrJd/7nMav5zrsjDTeWjdA+ziVA+z4Zh0KZOclbacn8D2PqpuwAfuWuAAk ca+9OPsCDA0agVxcvaSXcLw2LmvBhlrSDSOMLqSU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id 1C279384D3CB for ; Thu, 8 Dec 2022 09:19:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C279384D3CB Received: by mail-pj1-x1035.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso4062513pjt.0 for ; Thu, 08 Dec 2022 01:19:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2y6dRPU5LYzHxjxxTL/PSFHx0tparD+bi+Y2IDPTsLk=; b=GzSWp85d5EZg6jzy8FtRWuQcJPD7CwsWubr1WdI+42sBga8Myl2Wm6Zs559tWzpddr A52PxWEqNwFSKjn8JWxfF8nyRUhFMwhUTax6QaBccT+LKBrX2n+a6MsgtrKLT+73p/YQ RYuBChwJhz2Vq8HahVrdLes/pYbg0Kngkp+UTxiu6nfsXzHP2rMZjaO9LUn1bBQPcuny Bu0HAIDGmnGTWhpzyMRg4+8/KJkY3SxftcnkHVu8KIpAxYzNx7cGyDE7FpVbgGIESZAs +rq89j9BqVm/oWGhsEjyJxEwIwPRnRbVUgQTl3AYqAbRywXSTFAwLGel/rHP0JaYuZAN VwPA== X-Gm-Message-State: ANoB5pkzHpoKYOIy1ZCX3Fuqf833OSGCvgv7DJ3OXtUkLt3r08kPKI9m bnCWsj3NtTTv910ORNTmeMHaW2y1qeQ= X-Google-Smtp-Source: AA0mqf7t8hBcFuAMKihTe0XM9rHNkQ0cmmYWVO0hdZIs4SgY/0Ib+Eoy4yNR+BOEUTvPiQpJMdorFg== X-Received: by 2002:a17:902:7e88:b0:189:c7f1:c29b with SMTP id z8-20020a1709027e8800b00189c7f1c29bmr23153670pla.71.1670491139825; Thu, 08 Dec 2022 01:18:59 -0800 (PST) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:7398:37a7:4040:7c50]) by smtp.gmail.com with ESMTPSA id p1-20020a170902a40100b00189c26719cdsm10826405plq.272.2022.12.08.01.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 01:18:59 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Max Filippov Subject: [COMMITTED] libgcc: xtensa: remove stray symbols from X*HAL macro definitions Date: Thu, 8 Dec 2022 01:18:51 -0800 Message-Id: <20221208091851.3459448-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, UPPERCASE_50_75 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Max Filippov via Gcc-patches From: Max Filippov Reply-To: Max Filippov Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" libgcc/ * config/xtensa/xtensa-config-builtin.h (XCHAL_NUM_AREGS) (XCHAL_ICACHE_SIZE, XCHAL_DCACHE_SIZE, XCHAL_ICACHE_LINESIZE) (XCHAL_DCACHE_LINESIZE, XCHAL_MMU_MIN_PTE_PAGE_SIZE) (XSHAL_ABI): Remove stray symbols from macro definitions. --- libgcc/config/xtensa/xtensa-config-builtin.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libgcc/config/xtensa/xtensa-config-builtin.h b/libgcc/config/xtensa/xtensa-config-builtin.h index 36d4d9db330b..47782a064523 100644 --- a/libgcc/config/xtensa/xtensa-config-builtin.h +++ b/libgcc/config/xtensa/xtensa-config-builtin.h @@ -130,7 +130,7 @@ #define XCHAL_HAVE_WINDOWED __XCHAL_HAVE_WINDOWED #undef XCHAL_NUM_AREGS -#define XCHAL_NUM_AREGS __XCHAL_NUM_AREGS2 +#define XCHAL_NUM_AREGS __XCHAL_NUM_AREGS #undef XCHAL_HAVE_WIDE_BRANCHES #define XCHAL_HAVE_WIDE_BRANCHES __XCHAL_HAVE_WIDE_BRANCHES @@ -140,16 +140,16 @@ #undef XCHAL_ICACHE_SIZE -#define XCHAL_ICACHE_SIZE __XCHAL_ICACHE_SIZE6384 +#define XCHAL_ICACHE_SIZE __XCHAL_ICACHE_SIZE #undef XCHAL_DCACHE_SIZE -#define XCHAL_DCACHE_SIZE __XCHAL_DCACHE_SIZE6384 +#define XCHAL_DCACHE_SIZE __XCHAL_DCACHE_SIZE #undef XCHAL_ICACHE_LINESIZE -#define XCHAL_ICACHE_LINESIZE __XCHAL_ICACHE_LINESIZE2 +#define XCHAL_ICACHE_LINESIZE __XCHAL_ICACHE_LINESIZE #undef XCHAL_DCACHE_LINESIZE -#define XCHAL_DCACHE_LINESIZE __XCHAL_DCACHE_LINESIZE2 +#define XCHAL_DCACHE_LINESIZE __XCHAL_DCACHE_LINESIZE #undef XCHAL_ICACHE_LINEWIDTH #define XCHAL_ICACHE_LINEWIDTH __XCHAL_ICACHE_LINEWIDTH @@ -165,7 +165,7 @@ #define XCHAL_HAVE_MMU __XCHAL_HAVE_MMU #undef XCHAL_MMU_MIN_PTE_PAGE_SIZE -#define XCHAL_MMU_MIN_PTE_PAGE_SIZE __XCHAL_MMU_MIN_PTE_PAGE_SIZE2 +#define XCHAL_MMU_MIN_PTE_PAGE_SIZE __XCHAL_MMU_MIN_PTE_PAGE_SIZE #undef XCHAL_HAVE_DEBUG @@ -191,7 +191,7 @@ #undef XSHAL_ABI #undef XTHAL_ABI_WINDOWED #undef XTHAL_ABI_CALL0 -#define XSHAL_ABI __XSHAL_ABITHAL_ABI_WINDOWED +#define XSHAL_ABI __XSHAL_ABI #define XTHAL_ABI_WINDOWED __XTHAL_ABI_WINDOWED #define XTHAL_ABI_CALL0 __XTHAL_ABI_CALL0