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: 31249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp90647wrr; Thu, 8 Dec 2022 01:19:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf6u93P5H4WtJ8WdXAOJvD3N7wJbd0YzxFNXkcpazyLtI3Cy4xaI7n5xgmH4v7HJZMbSVs8/ X-Received: by 2002:a50:fd17:0:b0:46c:97e9:476d with SMTP id i23-20020a50fd17000000b0046c97e9476dmr15254936eds.389.1670491187247; Thu, 08 Dec 2022 01:19:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670491187; cv=none; d=google.com; s=arc-20160816; b=dCZYnZ8ydOmP/h4Ey5e0PcyF5kQIbmkoWFLS13f43bl0n6PBUgO/XP+fm/UTyf8wjP zD/7H6jMl2+EmxuJBuAOJpxIl+Ejy06Ti604FPTatvuQ5ToFshNlrablXGyJLsFS8+Ws jCZCAl9dE9qolNc70Bll1XY6xPTJUNtXjcjiEMUcnEbWjOl2ZOb3lsZkvC3hzAYW3lHf JIo7vF8Z34a07Md6kY/nTP3OaM/PrcagBtJOXC00DuepTpkf/u9AtI0b/29JlpVL+jvN UyDFj4hPVoHryhqK0VOwRvbWo/MPduHMi/1LZZcasIG1Mp1TU46yvYSmPqrVT05ynhIZ +hSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=2y6dRPU5LYzHxjxxTL/PSFHx0tparD+bi+Y2IDPTsLk=; b=j+PdfmwarwumhvaIWJnbAmBPPJCuGQLjVGQn83wL90PNx0yNJNVEqHbcakNGYbuasS dM5m8jQVTBfFC2b14/HjXd6C2k968RAibuTD4tqQvuOuAi/T62TLXQnmOfXrleaP0Ek1 8Z+sUClG1WGYiDxPIqQe1FCDkH4zlaqv+Hc7+qigRB7lDMKqlPIbLMwag2BtcU+dSY5e IvnZUYKifC/Osxm2/psarF0rsvK1OjvKaiLJTt5LS9WMiWPqJyK/E46vZuntSwjZtSdO LZcidMkcCmppwEwMZjq33O1VuyxU/kjKy+BjEStenF32/ISqvJQGFag0sa52/VSX/+W4 QkfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=GwLNajBG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hs3-20020a1709073e8300b007c09f4b0947si19448920ejc.1004.2022.12.08.01.19.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 01:19:47 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=GwLNajBG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 11D59384D3C2 for ; Thu, 8 Dec 2022 09:19:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11D59384D3C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670491186; 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=GwLNajBGxCkjiEv/XznP8bLU41Mb0LUsRHuiT7ttaCpQ6rqaE3x+un8iD+CZvwlUh xlzGu0ZXvDRwlY0TgUJ7ifa9shgwIa3FIwDaeE6QGkOa0g0tWlU3j2nM5mH5m9K/Ua io8tOKYnsTeOzy4p27xFwXhaZ/ilgLlhI1nbNU8k= 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-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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751636967273308125?= X-GMAIL-MSGID: =?utf-8?q?1751636967273308125?= 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