From patchwork Tue Oct 18 12:12:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Lapshin X-Patchwork-Id: 4141 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1924574wrs; Tue, 18 Oct 2022 05:12:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM76ZBvLvAnmhFGwbbMH1FquG1LUapWpLJEx1/Nmianv59HI7MHh6lh13n0r5h6Hnd+zVQx3 X-Received: by 2002:a17:907:7e87:b0:78e:2dc3:945 with SMTP id qb7-20020a1709077e8700b0078e2dc30945mr2176515ejc.326.1666095146029; Tue, 18 Oct 2022 05:12:26 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qk10-20020a1709077f8a00b0078d49f0df9csi13308260ejc.453.2022.10.18.05.12.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 05:12:26 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.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=@sourceware.org header.s=default header.b=sydKi0zF; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A9CD738582B8 for ; Tue, 18 Oct 2022 12:12:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9CD738582B8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666095144; bh=Gydoxi20MyuGvyYgo++YFn8NjxUh/w0lRQWbm7BcoQg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sydKi0zFnOE+POVWGaX9EacquDlNgwD5t7BxRKcrksHFHEjeaDjEXt1PyJU4a0Vvs VaH3qgHPCD+1X/iRu22GW+zc6y6JcUB1OMpHL4w8oY2q94rCCUOvvw/eLoDtz7yG10 Nvg1P/hlSMSuwsTo2oXwf6akQn0TmpDK267b393c= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2137.outbound.protection.outlook.com [40.107.215.137]) by sourceware.org (Postfix) with ESMTPS id 6BBE93858C83 for ; Tue, 18 Oct 2022 12:12:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6BBE93858C83 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAUMJi91IJCuYkkPRm2HVqQzn04bBjfzDJvN88DPkltvEDpLTT7G89j5ReWDFM4+Fw9s0b7HHY6x1QyHBfwbouDOjbG8USegaPC4l7D/7TZvXGQaT7E5s4GG3AK4HsUS5E5BnDx6QBnQs4vw4w+odA2pzBhGLyQhoTEZhZjZOcWcJ4EKkrwp2M107EBdbSvCBB0ejCUOd0N9be3nt5uOwEUT7al65rPf1lkMB0e0DZc1X99vOma51nNvHG5lbFxF2zSYrRbEbw/ERdkb441Lvef2gOEp4I93qpumIMF5+oyeWuoOx8mv/udRl7bAwA5qtLBtGWEOqo+uueuDCfYWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Gydoxi20MyuGvyYgo++YFn8NjxUh/w0lRQWbm7BcoQg=; b=WTnrzEwpm4pajup0JhXrYtX+og3z8Tw2bbdsKTY0oG3pMaxUTgTUTeYLVlUI5XiTvDBPoKRUmWR6nteG9MfAwgtZtIBegSuMgNqomIwnpij54hVGacN5gQsWR63dDjS3p1TyQVMrJndafmCZbkuHbWenhr37S+kx7JfOJJ+iBepnjeC8u24m/tXgkItJ7eXDAC3LN+6tzmxTPTidy4y5CmYSITUfSwR3QNU5JlkTCno2zyPInyP2ogtts7g6teGFd3zlMw81qkYZS8vYySDNIRzDxOA7x36OIYe6jAH3NzbcSSId23yyELTmv9RgyjvOWF7so6Dvv75FDcL7XJMnpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=espressif.com; dmarc=pass action=none header.from=espressif.com; dkim=pass header.d=espressif.com; arc=none Received: from TYZPR04MB5736.apcprd04.prod.outlook.com (2603:1096:400:1fa::7) by SI2PR04MB4300.apcprd04.prod.outlook.com (2603:1096:4:f3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Tue, 18 Oct 2022 12:12:08 +0000 Received: from TYZPR04MB5736.apcprd04.prod.outlook.com ([fe80::e64d:5c85:a83c:5898]) by TYZPR04MB5736.apcprd04.prod.outlook.com ([fe80::e64d:5c85:a83c:5898%4]) with mapi id 15.20.5723.032; Tue, 18 Oct 2022 12:12:07 +0000 To: "binutils@sourceware.org" Subject: [PATCH] xtensa: use definitions from xtensa-config.h Thread-Topic: [PATCH] xtensa: use definitions from xtensa-config.h Thread-Index: AQHY4urXeDidlo31H0qnBEvo63RimQ== Date: Tue, 18 Oct 2022 12:12:07 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYZPR04MB5736:EE_|SI2PR04MB4300:EE_ x-ms-office365-filtering-correlation-id: e68c1cbe-f72d-4b47-3093-08dab101fa33 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5JYc7m/FkvKQueOnklIxQp7dIRwwopYmzQLdmXqCzSh3iqd9ozocygicAOnFMsWHixlgM2qDKG8KmspXAVQwJGoAIqtw5wT+k8yckbGQkIMzlPNHf0WGgu+gxupD7E/7ktRg/4kJIC2maRA7kXQV8yDrgQ4Ay0TOGW1oeCKxouFXNOc0VhdknyJl3xUekPOIfdv7ckkaL4GmdmBA0QoDQwMnUgbBGBCKtHGwiXiPuJdr3TKPPRuSZ/x2pSHSo+M9JTnUhUojwOPd1Rqk9dOQSvSs5OTn5Zr50XeIeh7PAZil+JppE/TqSxE1/iUIMWVCVFgojDXuCt8R8nlTlwCimPK3Wo1JP+JbOiKpZMVyXI7ylR+aBgv+8JP7+pmwJYBJ1ntD2vPdslJVVGRk2hsf+SMQBrKKoivyLeXtRxJ9VIJDdAuue9v0U44gOkxvKFwiC+aTTKNn4fQWd9jokf2rVAuguajowa3wgfRDOl5TxXbSv3GDDiLjxj9l0GymfP83yn7b8Il5mvmkAdklhgA9vcQQ7H8uflYQfvUe2HkyEzmyS/VRuyyKrPh4yjbHphmf6yrtaSMXf1ayIXvreV4E+YKcNt14cCzb52fpDvVucde+7N4mo4gooFb+ZflAPFDNp2g75Eu3tQnqpne0HJKwLdP28UkSh+CvPSE2UDgXmU+1CguwEXBaSRHdwLIXj/E1feDD9klVtE7B9LpS0VZcUnAer8b+7TW4ZiBro/A5D+TvcnhqDElXu47nxisk0fgkwXTq8Ha/+WKeUmMsfKA6Mg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYZPR04MB5736.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(39850400004)(346002)(396003)(366004)(136003)(451199015)(71200400001)(53546011)(6486002)(478600001)(186003)(64756008)(66946007)(76116006)(66556008)(66476007)(66446008)(8676002)(2616005)(91956017)(41300700001)(8936002)(44832011)(5660300002)(38070700005)(2906002)(26005)(38100700002)(122000001)(6916009)(316002)(6512007)(6506007)(83380400001)(36756003)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?DM40hu9dNJsLiK9PGIC4455h36Zb?= =?utf-8?q?cw/V7cRBOYPSfmbB29aCXqpKhzQMKvE6WwCiC6A2ups+NVj/bOy1cMsjJwElzIJQK?= =?utf-8?q?gEgR1Bw14CTAq8nhGXxTq4FiZJMrNOSgZvby+qiH4aBVkqv46p94IoIGHUBxQ7ky5?= =?utf-8?q?Pryhlct6IUG5tQXg9rAm6Lry/lkQhRRjSpFCiZUzAO7+mL7HuEvKG6juD50RPfkxz?= =?utf-8?q?iVdg7/i+YSIBJmd3vNJLEcj51Scb/KOTSvye/wwYf/BT5KEEZWC/SuBEqw1lYEkpJ?= =?utf-8?q?xTxWFWGrFjQA0zYvf31O0J3/O6x+FjrgW/ftgvvPCnQcz/xRvGrxdJItI6fs9zLXh?= =?utf-8?q?3R1Z0VvSVhkJE+0t0y0jMefvKpw6ognoT2MEeKwmHZ+R+8O1UucJ46jTWvTvsMI0/?= =?utf-8?q?5UmzaEdu5ifiQgSrK0DLEhAXDk1Aff3rZQlPetCBPvbxVcazW0GKBwmg3ecrppIGO?= =?utf-8?q?owe0uuM9R4ags7ap+5u9XA3yg7H7czMQJ9TUKHTKv4F4U4+gJtF3wcc6+TOAwVhwC?= =?utf-8?q?wp7K5weReQyc1I2dVfm8MRQ3DT9qiCAkAHg5dErfKCg4ziCAH5gj0qKRUAj5FvH3E?= =?utf-8?q?ybrCnJ9KGS8eajZuTAT/pZRSJ9t8k2uFGZHZyQX03ataEL0Q+ksIBN3Z3ecVozk5F?= =?utf-8?q?GmRFlJmTpmseB6NMBZf0bFIPShHAvyrtTEE+fENEYHAV2RJV9HzI1hCIx4xjDQOmD?= =?utf-8?q?oLVm7xbhfvvDxY0KLlRsGVUE0/0HRaLLyafTKhtiVdRssN569oOq53XMD8MAZdI78?= =?utf-8?q?DY4rWz4P4KnNPh/ZyYn+jf9xeq4qn0ecKFqh53txMYTeakDrYo0fWvh26tAf6cul5?= =?utf-8?q?57fO5M3nIGbQolACyzY+qv4SNxc4hmRbmut1QcM+/BrF5AHL5Z2h2fpkB1t0oDVUr?= =?utf-8?q?I7qk4rcLk1NXVR5LEaaihOslQ3gmC0BF3+6ToK4LMje+FL8ZuHh3zfqMOz5/jxvwX?= =?utf-8?q?t2Dp1KBlI8qTusmCg11qgjLZjLvxlAizB5MDGybEUYLpwfP54jVpYvx0lH3W2Hhy3?= =?utf-8?q?hU+zl0pSRW4nxqI0lKLsF1ReulvV7STYgeZ2zEQw9AyVxugiMTrmcu8wkLO6f+/6m?= =?utf-8?q?id/xnEdWBRsuATr1Y065WO6g5YmytBmOpSyppQfPY/cuxfnxDbgCajC/fFpxiVInz?= =?utf-8?q?SRbV9hUThZ9qOEhXQHbS6AmKIgSaUxiFnsyD/6HIgT20pb3rEpd7kgwO136GigYvc?= =?utf-8?q?VNL+mp8MpkgK0gjCHHyf8GJ/E9E/fQLVVQP/oTkMjWS/PKHZHdPut9ucUXcM+ZavT?= =?utf-8?q?WlvjLbyvgvA1UQVxSZbe0RwM7VOL7w050nqzZ7DpspXfU8W5B5w0jzFbGRqKJ1cXN?= =?utf-8?q?GicpjsikvrZLfVojnHc9ZYTLRiF1f1d4vPW3Y637MZ2S6DDz6WXBMe5PVtFlBg2/S?= =?utf-8?q?2hcNtloxzKXisL6BNYggvWV0gKRi8qPhOuZzE25EeXRW+4XjICh/R9noNJhUWmzrw?= =?utf-8?q?YEqJgkH9DD14p4M05sCKwZcM5GRNFdZY+aRVN922mFc071DDnfKKlyZaIcWPthMUe?= =?utf-8?q?m0AdZyExGtEcJKdwwexOQioH3COS0aqe6RdkWShzfjkDr/A4me73l1Q=3D?= Content-ID: <76AAFABCA877284CA5BF483CE7164E6E@apcprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: espressif.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB5736.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e68c1cbe-f72d-4b47-3093-08dab101fa33 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2022 12:12:07.6462 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5faf27fd-3557-4294-9545-8ea74a409f39 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: WaQD5g6VT17D/nIFqBywRabPl9LQkzpU1IpBF4Bgl9MCI5Cfgla3hIWhuOuzjm3IF6PLJ/Pkuv/tK7nhydgmL0Otc2Bn3Ce1nsocHgaRXYw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR04MB4300 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexey Lapshin via Binutils From: Alexey Lapshin Reply-To: Alexey Lapshin Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747027384024790861?= X-GMAIL-MSGID: =?utf-8?q?1747027384024790861?= From 08677e05abb4b9df0819907eac0b25323539089c Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Tue, 18 Oct 2022 14:03:37 +0400 Subject: [PATCH] xtensa: use definitions from xtensa-config.h These changes are just refactored xtensa config macro definitions to declare them in one place. --- bfd/elf32-xtensa.c | 16 ---------------- gas/config/tc-xtensa.c | 8 -------- gas/config/xtensa-relax.c | 4 ---- gdb/xtensa-tdep.h | 8 -------- include/xtensa-config.h | 20 +++++++++++++++++--- ld/emultempl/xtensaelf.em | 13 ------------- 6 files changed, 17 insertions(+), 52 deletions(-) *); static void xtensa_strip_inconsistent_linkonce_sections -- 2.34.1 diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index cb658483ca6..0dd551a1a3a 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -37,22 +37,6 @@ #define XTENSA_NO_NOP_REMOVAL 0 -#ifndef XSHAL_ABI -#define XSHAL_ABI 0 -#endif - -#ifndef XTHAL_ABI_UNDEFINED -#define XTHAL_ABI_UNDEFINED -1 -#endif - -#ifndef XTHAL_ABI_WINDOWED -#define XTHAL_ABI_WINDOWED 0 -#endif - -#ifndef XTHAL_ABI_CALL0 -#define XTHAL_ABI_CALL0 1 -#endif - /* Local helper functions. */ static bool add_extra_plt_sections (struct bfd_link_info *, int); diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index 98c2c663994..03d6714e916 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -31,14 +31,6 @@ #include "elf/xtensa.h" /* Provide default values for new configuration settings. */ -#ifndef XTHAL_ABI_WINDOWED -#define XTHAL_ABI_WINDOWED 0 -#endif - -#ifndef XTHAL_ABI_CALL0 -#define XTHAL_ABI_CALL0 1 -#endif - #ifndef XTENSA_MARCH_EARLIEST #define XTENSA_MARCH_EARLIEST 0 #endif diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c index aad9ae7d348..351c79e83d7 100644 --- a/gas/config/xtensa-relax.c +++ b/gas/config/xtensa-relax.c @@ -95,10 +95,6 @@ #include #include "xtensa-config.h" -#ifndef XCHAL_HAVE_WIDE_BRANCHES -#define XCHAL_HAVE_WIDE_BRANCHES 0 -#endif - /* Imported from bfd. */ extern xtensa_isa xtensa_default_isa; diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h index 1840ef98b49..a705ac72c39 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -157,14 +157,6 @@ struct ctype_cache struct type *virtual_type; }; -#ifndef XCHAL_NUM_CONTEXTS -# define XCHAL_NUM_CONTEXTS 0 -#endif - -#ifndef XCHAL_HAVE_EXCEPTIONS -# define XCHAL_HAVE_EXCEPTIONS 1 -#endif - /* Xtensa-specific target dependencies. */ struct xtensa_gdbarch_tdep : gdbarch_tdep diff --git a/include/xtensa-config.h b/include/xtensa-config.h index 03963da6c7f..41e766508d0 100644 --- a/include/xtensa-config.h +++ b/include/xtensa-config.h @@ -166,11 +166,25 @@ #define XCHAL_INST_FETCH_WIDTH 4 -#undef XSHAL_ABI + #undef XTHAL_ABI_WINDOWED -#undef XTHAL_ABI_CALL0 -#define XSHAL_ABI XTHAL_ABI_WINDOWED #define XTHAL_ABI_WINDOWED 0 + +#undef XTHAL_ABI_CALL0 #define XTHAL_ABI_CALL0 1 +#undef XSHAL_ABI +#define XSHAL_ABI XTHAL_ABI_WINDOWED + +#undef XTHAL_ABI_UNDEFINED +#define XTHAL_ABI_UNDEFINED -1 + + + +#undef XCHAL_NUM_CONTEXTS +#define XCHAL_NUM_CONTEXTS 0 + +#undef XCHAL_HAVE_EXCEPTIONS +#define XCHAL_HAVE_EXCEPTIONS 1 + #endif /* !XTENSA_CONFIG_H */ diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 756e33cbff0..9d82b11d2bb 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -29,19 +29,6 @@ fragment <