From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 4FA493858283 for ; Thu, 18 Apr 2024 07:40:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4FA493858283 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4FA493858283 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713426037; cv=pass; b=s8/4zORgQA7S7HGpSZs8e8OuAzuV8UtKVr4doXBLzE99vUsFIGQMblLHHFoWsKx0wq/vOtAqQF7Zhl2XMaKVmfGTDcl41+Tck6HchelkqQ6DmlpblHpPtol6NhCq6Eg/+bw5agls73ISI3NrRfhgiCbAuBIPQVh1u275srhWWAY= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713426037; c=relaxed/simple; bh=aIPyvxjHcjVacAJGtRK2RG5S/PhoQKnQRytlbu3pa4c=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:Subject:To:From: MIME-Version; b=unCQwj88gK77XiXaH0uYylwrPE5NvtWQgkOfN5iz0EstwkhgXb480PkxAKOZqy7rkWT1ba80hQXv9pb8DG9tcwseFfyDgkmC4oQCByrTq1dnfFaWPuZ05toyJSVwUcZ6zljv2WSo5g0FYgfPlwglZEJuoQa9Yp0CtI7XQiBeUn4= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3x9iL005659; Thu, 18 Apr 2024 07:40:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2023-11-20; bh=PwlQ/infDH881lPOXNb+3oFsIKkGwDoU1VxsKQNR7Io=; b=fUUB/Q0xKczL3eUklJGp9iriK4iQ5dRIxvEG4ggS1SIsfr2kRa707R69ajegYN4D3kbE XANC+3rnVh8qI9ge7Ob3TFwEO8yLQhCgWpD/JjSXuVStMnEX+OXkg7flvdRpU5c+oGR+ R1l2ZQnecVGixlRfGqit7x3HhgxsKeDgUJZrn45Ae9wnRMI98zimNQYnMzarFxaC81XL 2iwPDYOf3Vh93z2G/9l5ziDuguJD4sOal2EsOGTyRNkx3WBG5Yl62PI0ux1gErGjZ2hE VmtPI+P0uf1YeF5jcCUKIiSfaAp1Ne1Tqfp0WyS4XHpoVnfEcI73FWCjSDdFCGaD1LgC TA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgujsuu4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2024 07:40:34 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I5xoXo028838; Thu, 18 Apr 2024 07:40:33 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgga04p3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2024 07:40:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BOg9Q8O+6D0iby4mHuaJv8jlty+BfT2qJmxLkwyJ7LCkma7zdazCRFsjNlW85gKMNAYR82LmUYRJ9k2fpTZIfS3XLdDPwevrvwBsr1yV6WQhpYlvOaL8B+YcHu9BrQWxgPhvrEru4PaFMUwVv2unusq6TsCDgPctTxk8SmSTS2E43EnhvXCp5/akWS9JhYS26tKWFDDzxgVByA8U1j7Uk7FFI0g+D5N/T52u8Su51LVu9jPUSdUQdoxuBTpN0OTWp5gsNLZSwT6ENUys1nxK9abGImK3WE1dkmEF0++32EvG5nTWD5gk+G0aN38WS+Q4q947brZUWTxT9CL/nUBm9g== 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=PwlQ/infDH881lPOXNb+3oFsIKkGwDoU1VxsKQNR7Io=; b=eZ1tXT0MvqYk61FnELT4m4D5G1sZzaiJecWDjiFQXPYf1C+x2NOf5rIbqDKesmuI45knPEQS0O3CeK0/aYDpROtNiiX6z1BSbGp2ud3nU2WAOpamj+cQsbdM8tWqrDfBHfVgUeQT5N/0v5FtUrE9vDzQOeezHe/cEgwJhTVadpvSub0HU4VDwhxHnfpVHbdI9QuGEAzmi18BrQWYnj5FcRNsCQjOXcwyN6zfnkP8lHfiaTO5QX+k3xW78Ov6eX3XiggKswGqpF9+ym8yuRJquy4i+p6fIxWmwKG92rZ1DvX3HH8mjniKzHBQK8jeqG9FWtM4TvWonb+hbV24JggRBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PwlQ/infDH881lPOXNb+3oFsIKkGwDoU1VxsKQNR7Io=; b=wkkjSXILxCdeZjgrpjcMRHjZMrPp0/zFMKhuVM88DZtZtEwyf9+woE+hQ/DmoUu1mGnVaR4p44GP62bMpT2HabAL8pn4cEQyIkQRhbztcZIiCiMCSeYnD2z2P3le6g6zDQatIvTiW254tyBk8oQA3+eRRZ/+Zv3/mcDvhnJRwGc= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by SJ0PR10MB5694.namprd10.prod.outlook.com (2603:10b6:a03:3ed::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:40:30 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6f0e:742a:270:889]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6f0e:742a:270:889%5]) with mapi id 15.20.7452.049; Thu, 18 Apr 2024 07:40:30 +0000 Message-ID: Date: Thu, 18 Apr 2024 00:40:30 -0700 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 06/15] gas: Skip SFrame FDE if CFI specifies non-FP/SP base register Content-Language: en-US To: Jens Remus , binutils@sourceware.org Cc: Andreas Krebbel References: <20240412144718.4191286-1-jremus@linux.ibm.com> <20240412144718.4191286-7-jremus@linux.ibm.com> From: Indu Bhagat In-Reply-To: <20240412144718.4191286-7-jremus@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MW4P220CA0004.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::9) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|SJ0PR10MB5694:EE_ X-MS-Office365-Filtering-Correlation-Id: 17ba03c5-4e35-4858-4af8-08dc5f7ad2d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OZxPV3Cjdn9y0Q6PlynW2uP3gya5hmJRerni74x5oUPDHCQbNZ6wWCF3pjkHmSfc6EkxrjJh20uan409JiIKKTq5l731RzeIOfMMr1rC7nZaqGunKk3zCXHVkjxCaLG4YvdsGGKOnA2HmK1Op02IznodMmgwRMC5lrQZid7Z6c3eDKMxalAwi0Cx5U8Fjnrt6Ik+KcF9tUlQ7ECRcvMSx1GyProon8CfngXBtV/alNpJivhhvDQj8L5/lBnc8NkQ+wGQ2/A+6a//eFngg7Gq6Utd4Tu1oLHIFSa3l7wXUXGlwEb9k0sXzQ7mZ1VK/osE6qgCTgFiiPkRR/eWusfN8bbe5MfKv0XBanoflYXGlkTmik4oxGQGWlYpwOSf8/cCh3x+X3CAd2brWBRoFsxK4ffaeiX3BsTvd7JZTHO9f0FlchytvctGirCcqcFRM4qOqExOhgWS6AQKX+E3EzZ45dDMvCH0IWG8DxjAJBqh/7Ef6zQcAaXj07YsKMZM5azLYP9vfB1jkcfvnp9SGzU0bkTiQrdbqqSDGbjtX/+wfUB175Pj0uNPhs/QfcF3qEya8iMFHwThXRQ9/IQHONaIyOZIYsdD7WvMEC1CuLRbQ59cjnBHRVNPVekj6jLbF5yy5Ql55LAIysnZjbYoQsa+QbY5KRzA3r45ta7M5qmFxdU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2158.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MmpSVHpydHR3M0Q1WFVpaTR3eTN1L3ZtcDh3cUlhaldXSE1JYXcrN2VwYWVx?= =?utf-8?B?eUNxWVprUmJNRGRFcXZZZkZubWxqQW9QMXlNeStUNlkyZ1dXWWdCc1czZkNl?= =?utf-8?B?bUZ6c1BSTVdvMjRCcW1NY0pxNVo1MDQzZ1Q3RlI3dEVuRHVoVXQrZzZMK0hU?= =?utf-8?B?VG1Tdy9zR21Fb0toMXhBNStLc08xWXl6cTVHTkFpWEZ2NmNvbC9abTlwc2dp?= =?utf-8?B?MDBjTzdBTkhqai9XaUY3R1BYNnFzYlJhNnpKenJNb2dlbWZ0WFZ0ZmwycEZ3?= =?utf-8?B?a1F5MEI4S1R1aGZBeHcycDBMTW9DY1g0L3liNVhoMkU4bVZEMjdGMUVRbWFU?= =?utf-8?B?d3ZpKzBGcUJhL3pxODRmMHBsWHR0RC9pMDBLK0wxT1dsbW8zYTFBUHh1UUkw?= =?utf-8?B?SklWeWZGUG1aWjdFYStZUE5oeEJVc3VhNUg3S3lmNXpzZDBGZFZuNFlwZ2FB?= =?utf-8?B?bSswSGtzbG5VdlhpZFR6TTdsUlpkUDYrdDh2Y09kdDJIREQzVWxyVDZKR0dC?= =?utf-8?B?MmJwQ1FQNmRPZTlreVZSdGdCYlIvalVucVUweWtUeXNkS3Mvb25RWFpTdENx?= =?utf-8?B?RHJjY2NtNmJCcFE1U3lReUNzTHpDUkRBY0t5Y0dMbGJaTktCY1FmTER5clYw?= =?utf-8?B?dDNyQzFhTUFKN1dJSWwrS3lNNzBrN25vcmNmdnNLalJGY3h3UFd1WGsyVnpD?= =?utf-8?B?VzE4Z241Yzh3aWRkajJDTUM5MDNvMHc2MWJCS0RocVduclFJR3FxV2dONTRW?= =?utf-8?B?TjFjTW16dDRDeGpiV1orcitCQUV1SFVvK0JkQ2dPVnNJYjRZWEl0cWdOYTJi?= =?utf-8?B?aytaVGtKaEZUcGwyd0RqUDNKeXVMbWZzT3VHNnhkekdzQ0dVd3VxSmVYeG45?= =?utf-8?B?d0tqT2g0Sm1PM1NiMEswN0RnV21qWDhxZzRhRC83Q1QwZktZV2Y3cW1WZDJG?= =?utf-8?B?Rm42UmVoZkxVV2s1SGRES3dSc1d1M2twRElqbzlRdVNwQ05VTEh1dDF6Y2tL?= =?utf-8?B?NmtKYTJ0Q3pjQTdWdTBVclZPVUpvN0R5MHpnVUdJa1Q3WE5DODRJblN5b0JC?= =?utf-8?B?WEJYTDNxcUFrdlQ5OUI1S0dHYXdDVXVUdFBaeCtYQWF4WDk3YlFzLzdWMlBW?= =?utf-8?B?REhkbmFtY0diTEthQ3F4QVo1anRTd3JvZTdlb2s0Ni93NDFqbzA0bGxyOHE4?= =?utf-8?B?OEpnWW1qUEhPTVdodDMzd0dBNEtuajRNVkJudWhGN0pkNlF0VHliVFJpRzkz?= =?utf-8?B?TnVQUmpYWmp3RDdyTE5SNDdxd0JiVjBzbG1YS1BLS29ObzZVZ242M2hiUUZv?= =?utf-8?B?eWxhdTI1VGlrdTRoY25hRWxuNTFWUzJRZXJTc0JFRnp0RkVSQ3R5cU5RbFFY?= =?utf-8?B?OU5IM2JXYTBsczg4OUFETnF3NE1PSVBDTW80Q3h1NTl5NE1CR3B5RG03d01k?= =?utf-8?B?bDZEWjgybkRIeFNUZndSanVjRUxlajlHbmthZ0gyWEw0emEyVmlaZHg2QXVr?= =?utf-8?B?SUJLeHhtUGlGeEtLSkU0N2Q0Mnd6Z1RXeEJQMkUxNmFGNDB3dnd0a0NhcHdo?= =?utf-8?B?clBoZ05ENFFHc1lHcVdFbS85SGtmR2ExRTZnUTdZL0ZLTnRCNTgwaWdoR3VQ?= =?utf-8?B?djVvNWlKMytkVmx1RkdaVFVkcG5UMEdJamsvRHBsdzBoUU5vbDdDUmc1L2FD?= =?utf-8?B?OTUzbDcwWnRMZkhIUSs3RlM4ZU9aL3lBQy9iSmlKT0NVQ1NrUVpPWlNXRXYz?= =?utf-8?B?VFJza1h6b1RkekpLZnFFSjJ3ai81UFhubE5DUUFhL2JETzk2dXJmODFFaXdX?= =?utf-8?B?Qjg3VmlNMDRXU28yVndPcytxQ3RvdTExYlk4TXJhbEx6T1RBMnZ1MmVlRUlW?= =?utf-8?B?djRkMTVtT2JLSWpOdHR5RWhzM2pyWmRxd3lGaTIwZFdaYUZlZkxBcmNEOFhP?= =?utf-8?B?ZHo5R3BMVFhwK0R5ZXJGK0pEMzAzOFVEUnNJeCsxMmR1R3BLcDNJWjUyZnVI?= =?utf-8?B?RDJXeVRoeWVjWU1EeS9UcHlPSDJTYjlLOUE4RThlQ083TTlQUW4zaXhOSEQr?= =?utf-8?B?QnA2QUhjd1BraWVNbzMrKzlsN3ZMNVUyT0R6bW1zQ1VIK1BQanRONEJ3c2Y2?= =?utf-8?B?dUs3ODcrZkNCdGZLQjhPNzFkTUMvOHBoTGdMNEpuQVcySXBRVEphSmR1NzQ3?= =?utf-8?Q?k5enXv156kVptTSkpOqrDF8=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ZAn/bxJr+HODW2DodMyrjfHDA9zwy+wKQLtibhPl6uuST4psz0aLi3AURlNraMRh3H5modzJV4RUZwwdeztVMSwvCspCheks1aw1NR0wTqDi60ukd2IlmIKSYayDZqhDJtFFYEJ4VylJh9NoVdK2bAUiwl8C/YjoPp+xFaph2Y9r05UaZ63VOpaEtufbSgoGbcQf2S5zDopJ7cwsQvmaYQ7aXc5yZcvBodmwBKLFg7mN0yQVj777JKMmCgtIdppxvLUYOMcu+Y9NbbITgxwG4AgyQInMNKkINdpEazrv0S4x8nWeoOow+XIZU0nKWHtmJu8gumOoWZaUVsszhBQ0UswlzUraUrSYgZXZ+mzkXhmlpAwAo6YJjw6rqLfVF0Q3evOuEknERZhMCwELQtmldQQ9YZ5TXtegi/c2hT9Cvz/ItV45hU9wh+5CF3DggH/motosmPB8Nxae4ISZ1cl4h6tBwALvHpNMkzkZvhe0EsODTCnI8mTS4Cm/XSxCL17y+bnfOghtidIAOSrsEFkCfE20DZXbXz2uQywziGzgLChphYX7uqfiSzQrxPbthmuo31w4JBhXCMHO/3OP0fEDiRc988uDqZC/jZF8GZRSNBQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17ba03c5-4e35-4858-4af8-08dc5f7ad2d6 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:40:30.8280 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Nx2oIZFwowQhY9tTKj+diQagoRpYsXSlTH0M8Lqd6Kz2ez6aFn++9XTWA+i9iEk8Q5ROglk05s8NOmIWSyA1mA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-18_06,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180053 X-Proofpoint-ORIG-GUID: mauUOpSEtTosxeSqDgeLHOQzlAlTixUU X-Proofpoint-GUID: mauUOpSEtTosxeSqDgeLHOQzlAlTixUU X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 List-Id: On 4/12/24 07:47, Jens Remus wrote: > Do not generate SFrame FDE if DWARF CFI directives .cfi_def_cfa or > .cfi_def_cfa_register specify a CFA base register number other than > the architecture-specific stack-pointer (SP) or frame-pointer (FP) > register numbers. > > This also causes the assembler to print a warning message, so that > skipping of the SFrame FDE does not occur silently. > > Update the generic ld SFrame test case to be architecture independent. > Do not use CFI directive .cfi_def_cfa, as the specified CFA base > register number is not a valid SP/FP register number on all > architectures. An invalid SP/FP register number will now cause the > assembler to print a warning message and skip SFrame FDE generation. > Remove the offending CFI directive, that cannot be coded architecture- > independent, as the test case requires SFrame information to be > generated. This was reported by the Linaro-TCWG-CI for AArch64. > > gas/ > * gen-sframe.c: Skip SFrame generation if CFI specifies > non-FP/SP base register. > > ld/testsuite/ > * ld-sframe/discard.s: Update generic SFrame test case to be > architecture independent. > OK. Thanks > Reviewed-by: Andreas Krebbel > Reviewed-by: Indu Bhagat > Signed-off-by: Jens Remus > --- > > Notes (jremus): > Changes v2 -> v3: > - Corrected formatting of ChangeLog in commit message. > > Changes v1 -> v2: > - Update generic SFrame test case to be architecture independent to > resolve generic ld SFrame test case failure reported by > Linaro-TCWG-CI for AArch64. It would fail similar on s390x. > > Without this patch the assembler would erroneously generate bad SFrame > information for the s390-specific SFrame error test cases 1 and 2, that > get introduced by patch "s390: Initial support to generate .sframe from > CFI directives in assembler". > > gas/gen-sframe.c | 13 +++++++++++-- > ld/testsuite/ld-sframe/discard.s | 1 - > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c > index d35baaac54b2..1269b2b77c54 100644 > --- a/gas/gen-sframe.c > +++ b/gas/gen-sframe.c > @@ -986,7 +986,11 @@ sframe_xlate_do_def_cfa (struct sframe_xlate_ctx *xlate_ctx, > get_dw_fde_start_addrS (xlate_ctx->dw_fde)); > } > /* Define the current CFA rule to use the provided register and > - offset. */ > + offset. However, if the register is not FP/SP, skip creating > + SFrame stack trace info for the function. */ > + if (cfi_insn->u.r != SFRAME_CFA_SP_REG > + && cfi_insn->u.r != SFRAME_CFA_FP_REG) > + return SFRAME_XLATE_ERR_NOTREPRESENTED; /* Not represented. */ > sframe_fre_set_cfa_base_reg (cur_fre, cfi_insn->u.ri.reg); > sframe_fre_set_cfa_offset (cur_fre, cfi_insn->u.ri.offset); > cur_fre->merge_candidate = false; > @@ -1004,9 +1008,14 @@ sframe_xlate_do_def_cfa_register (struct sframe_xlate_ctx *xlate_ctx, > struct sframe_row_entry *last_fre = xlate_ctx->last_fre; > /* Get the scratchpad FRE. This FRE will eventually get linked in. */ > struct sframe_row_entry *cur_fre = xlate_ctx->cur_fre; > + > gas_assert (cur_fre); > /* Define the current CFA rule to use the provided register (but to > - keep the old offset). */ > + keep the old offset). However, if the register is not FP/SP, > + skip creating SFrame stack trace info for the function. */ > + if (cfi_insn->u.r != SFRAME_CFA_SP_REG > + && cfi_insn->u.r != SFRAME_CFA_FP_REG) > + return SFRAME_XLATE_ERR_NOTREPRESENTED; /* Not represented. */ > sframe_fre_set_cfa_base_reg (cur_fre, cfi_insn->u.ri.reg); > sframe_fre_set_cfa_offset (cur_fre, last_fre->cfa_offset); > cur_fre->merge_candidate = false; > diff --git a/ld/testsuite/ld-sframe/discard.s b/ld/testsuite/ld-sframe/discard.s > index a438b42bffa1..5591a50d486a 100644 > --- a/ld/testsuite/ld-sframe/discard.s > +++ b/ld/testsuite/ld-sframe/discard.s > @@ -5,7 +5,6 @@ > foo: > .cfi_startproc > .cfi_def_cfa_offset 16 > - .cfi_def_cfa 7, 8 > .cfi_endproc > > .globl _start