From patchwork Tue Jun 27 21:20:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 113622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8481302vqr; Tue, 27 Jun 2023 14:29:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5XQTmQW2glhaafbCEhyIz2c8hE6MFO2vJamBCbiBP6xS7OcCj+MRoGHhCcFQr73oqGJnUb X-Received: by 2002:a17:906:ef03:b0:974:183a:54b6 with SMTP id f3-20020a170906ef0300b00974183a54b6mr27626678ejs.33.1687901373770; Tue, 27 Jun 2023 14:29:33 -0700 (PDT) Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id q12-20020a17090622cc00b009926007b7e0si307537eja.371.2023.06.27.14.29.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 14:29:33 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=A+QU0hrZ; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 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 A0E0D38A814A for ; Tue, 27 Jun 2023 21:24:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A0E0D38A814A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687901077; bh=k1jBeM9eWeQ97xl5SwoteNVIAhwkK3YJ0ORMUmVLMQY=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=A+QU0hrZ0Enzza7pBZyCVfTN0F/agiRoutxCPfM/s+9VJaliJyC0jmZlofjjf0ds9 6DP+B9/9Bczrven+f1ti7z0K+uJ4Vz0YdmHPp8dbaNWyRrwRH5MNuNR123ampB+inp vmbukKveFm2UF21UfqY5ceZxRmEjcfbDKKfcplcA= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id D4E313856965 for ; Tue, 27 Jun 2023 21:21:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4E313856965 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35REkrP9012916 for ; Tue, 27 Jun 2023 21:21:33 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rdqdtp2wj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 21:21:32 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35RKd2Te003985 for ; Tue, 27 Jun 2023 21:21:31 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2047.outbound.protection.outlook.com [104.47.51.47]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpxb5n6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 27 Jun 2023 21:21:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OyCKVHd56SDZ5TDqmQ0AMigM7bgGV4ZLXM1PZsLgu0jF6AmoUyUSOWZFZR3fdQSk57MM5T7o9AeQ6xv2ktt4xiY7gDNkPMb1+1sEZy6OhRRDnMhYLR0oqWbzvhok8I5+izRggKZqZbptc/2EXw3EHJ79ey7M8Xt2mAboAsbdaGSiOQR1KRyCSMg+ErUd7O6Ta5qv//hCxtcVRac/fTzm6G+fP9f+mZM66PgDqDxfeui7nv9yz69+EWd1xlAHToZQcz19XVIPtGKux4VeHoYEVdg3Z7ef4LzPHqwBNbenV+ev1e2N+BqyG9LNHRY8U8Pmqlsi39sy0IKaNnas+pdIRw== 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=k1jBeM9eWeQ97xl5SwoteNVIAhwkK3YJ0ORMUmVLMQY=; b=oBCFY/Lg1hzCandW4+D4IG47aU0xAA8UbQPV//sbZwz3OlYFEGhSb+XpmEeyzPLXe6Tu96d3IpkB5z652e5VKKutzQ3Wg15OcNyyLkQOU/GlA2yApYLy0gkP8zhUhfhra/m0/w6RjH7JMLyO2HiwGgDKfuBrpOPu9VEu2ds/m/9RZiSMvaiRIeZK3dWVV2UpeWdm+1/wrSQ5BFmAZJhHcMe72dtdLS4xGoKE6asrSgRbGlW5toySm2MK6SBr/eaXIQ+mxx4vXUKq6R9DlCmZMqtavRoQhYhu7OhNjgVOQ6rN1q0I3/+/eJgIfo/1XA0N5jWK/vGemmSrJs305KPIFQ== 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 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by DS7PR10MB4831.namprd10.prod.outlook.com (2603:10b6:5:3ab::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 21:21:28 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::fdbb:b921:1ef:2d44%4]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 21:21:28 +0000 To: binutils@sourceware.org Cc: Indu Bhagat Subject: [PATCH 08/12] bfd: linker: generate SFrame sections with version SFRAME_VERSION_2 Date: Tue, 27 Jun 2023 14:20:24 -0700 Message-Id: <20230627212028.2138604-9-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627212028.2138604-1-indu.bhagat@oracle.com> References: <20230627212028.2138604-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR03CA0096.namprd03.prod.outlook.com (2603:10b6:303:b7::11) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|DS7PR10MB4831:EE_ X-MS-Office365-Filtering-Correlation-Id: 76e7a6b9-3be3-4fc3-2a3c-08db77547817 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2ocIHVDaKAylfbwFwZzWBsYB0kisYUgFlDO3/e7DC8kDAuffz+cDlub/zuVohfSmH3NdKNkg3KtFfDGJHqCaAJZQpb8BL73JNaAlQ7l/IftfztXFo/DOiRpGmf/fxXPQ2wgNC4lhq3v7HOEbnHfDadVbzwdjjxWVVML/3zGvnzWRpzKlAXm6CN4XPYLCZJAPA3HtZM6eaRT5ceh/BTq6na5bPrX/pj0bkaYJazPU0JvbAclikRtoU7IN3Ih9GVfHBnYYsZgOQy2/EHIPLDi0x0pNF4u/Fhxsc29aizWnk4A9P6v/W/KMna5Uksy6efvUzQoVDLnp/vfi8EgWNp0Zge/Bwltim+1mnsbb+OncSvEyxdtz67iRsJGLsZ3h1R8U5NashBYi1tsWFl4zL5jFvUW9hZVMEP1PZ9Bpg7S98v4N0MtU4Wg1MoEV2pXWtnyHiE4S/gms4MmKZtmobEiPlXPb3xbK+MkuoB8um+zyXSB/y+47B/+sdAEleB4KUmvZbGedajZmmMp7W6sibNLlM/JLfcgcl37lG1hyEZEMxj3wX+DTqECEA/LREYV1OX/e 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:(13230028)(396003)(366004)(136003)(376002)(39860400002)(346002)(451199021)(2906002)(6666004)(6486002)(83380400001)(107886003)(38100700002)(186003)(6512007)(6506007)(1076003)(2616005)(86362001)(41300700001)(478600001)(66476007)(316002)(36756003)(4326008)(66946007)(6916009)(8936002)(66556008)(26005)(44832011)(8676002)(5660300002)(66899021); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yz5lidbxAEVu23MCc3logJ0SBx4cUlDQpz7wM2snnzZZs2CEboBoMAQVhLBbvGCO9VWvJasxXEy4CZH49GM0AVo2e1wXwoOUX89h8S3w/1+UV73nr80kMl7iTaUw7Bugj7QdAHKRHuVjzxxXsShzrj7IFvHCFd4sjvCb2itaPPgDXaLmWJbtaw/CHHe3KxpT8F4bIdj7hLEnRVO4c1A/GIlfgaSfurj+ZeIL33WZQDw5vBhmsfe0vHIOMGiLIFuJoZlR7h7qBIJNbp/gYuyGsk/sVtV4S+5AAjf2i+2Z817WiLK3RKPIEo4oR4OZzk5lJvV3/x9yQBNZBvp0MjTG8Eidryha7+qvMBV8gEcS4BvR08KSKNapM3xUy/rFfZCL7F200pA1r0O6LTiYERzUAjSyrXin9LHGPVZy7cFomZ0tGkY9T2no/5UD3JYmTlSe2tuRF/0MtPQUaj2Ylq/OxpgntDxGKfW7FZxrQw8Ux8r3+R8i35r6CRPngBHNG0P0epkLzmEDwGyMpUnxOWaAZjQGB4eAMtmL4om0tnZa/iHdJZhqCzpN2vshhGdCHpNyBJh1L7gXJTzrO/lbTbFVmpaVwXtbglOC+7mqFjzqsjC/PnBo5+m+SK+a1x6J0xEASHWeIGgbdUclxtf5wsEMJRuAsoxrBV8TC7XPHcSCLcJiPeJ2Wt0XkbhztOmhxuaZ/7W+gj7/Q96x5g0gUYCNEc0KtsDqFwVOuf7P4VFVg9+eES6JTqEOzIbnAgfyXCVOH/w59D1AizFIpY1fz+7L7lJyhMAXcFqqVMziuu5NdWmOtfVLLvFTC2XGNgGu9ob8se21iX3BXiesNWI0M3KZr4Q/R8Xq0f6pAOjmp6IFqWAA1/tAOId523M7gGbhbHAYBb/KAvsmRSSJ62+q4WsSHc2r3ky2g/lmXI6QRUQouky3IgZCZArOY51cW1KTAVt709iFA1MgIusifu1HJr8sYayanhgYvR0hEPYAp83WPttnRntpw0t1ljzEPo4nh6d/LIEBp/bv0hcLJwGYdP19MMSSNk2TlPn9LYVVvNeYikPhVoUhaA9RKIQzj+3aKzZL3muiIsYlHRZrk3lDem64WOi8T1YDe2Bs/V5iMb84q0rI/wKicH7/bNnmR+/EtXE1jBoBlP8DuHODu9dm699MGevCQH7EN2rRSDjApYx1xdL03vYfTi/ifBvURc8N2epxJpyrBUu8Jw26tdpmVa2Ws4qShDIqFvZsapPbkZAo751veKpw92l3aO1awXNVNxiL07PlQ2So5psfGCxWE5BOfO+2dQkBJI4gMD6GWV6wOYaqDhPVVd/xsWi6MVt/lTwA71TrnJ8yeCLangXMRA5TkaLmoMW5ysZoAQxsUWNwWQMmDAEezM6biTtY12goHrzqmcCavRUtvQvqET3fH3wdkxY7bZxy8gATxujXQoBG+A+RnbY0dOHXAsbFb6IeI+HyP3m5zaif2EFs1RfU1O+9YBYuvN6mA9l3DP2i/ZsBGUFURzWRCHOFDMZ3G8SLMucCfo+U1wboQ1LSDgtyKF7sSEYr5ydTBPz5GAK51SJshV3M8HSYvbahGPPYWjxxEfkb X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JQp02wmiHoHVrIYch8IPpqpGT6DjONm2wql5gNiECktBUhZRUk6b4RLqLCc69x//p6Jsvfgr6bJzjhhu2UEM9/QE6sY+JHCCHTy1bs7aSItea3NXLOX0AzfKFCpdMUcO7/eB4wWXv+swI46kwJ5f29vOxZGxZTZ08cdeJmDylRbdj/Stkn6uRT4Itfg8pp0Nr6aXQgv80pwHtfERMdnRfO0jIS93bGFgWL6evZs+WcDzL52l1oxj+FIA0fgwkFi/nJ8XF+DzdZX48kt8kVomMrc4gEuqH+t/Q1l6lnhBdZlUsHhhAU/b+E/a/1KtaldDSoEcDuqP56XN7MpFgcw5g3dd5v7rw0nK6SrfFfLNnBKGhf5xijDqJe2v7q14uK92D8ZWUW9/yH2+BveHixm93U64qW1UZs7+jIABOHDxBqSCiDJNvswh+9RdOZaOTNL9V9wOmEc7Un7OVoLP5bXzDX2ey1WVyQNl7WLNieBy8bROA/bdZ+9rcKLjfKj0s+7I1T1gXJC5oozb+3VlFkTDRdecrgkKlcVBBhxjP/3j7tNux0ByWGEycNY3BngyVJ6geqgspORG1sL3siWZe8MPa3fE1yRFdO+iLrHAuNkfGEnc9Y3U9EJSxg7suJRoN7b2DffPqGK6Peee2atkT9TaN0kJrChBe2wRB0LIW8EKze+w2fzG68YP2P2Qw3o+oGwbA707ZDtwI5IVTCHXYCHNa/+bZ4tPH/0Ot2gWwIAu31x2x0MH++IU3nU1sqxEGCvc X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76e7a6b9-3be3-4fc3-2a3c-08db77547817 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 21:21:28.0634 (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: hXSWQrl4rhZW/UCr1PpslzyUxaK6su0gHLzRaWYSAobJqbDCF6JgwUUjVbqqV71JpMylJhzbVy2scKyyaPSkFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB4831 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-27_14,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306270194 X-Proofpoint-GUID: eytYMW8v1lI6E5WxQBI3jNy8gJktMbGS X-Proofpoint-ORIG-GUID: eytYMW8v1lI6E5WxQBI3jNy8gJktMbGS X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Indu Bhagat via Binutils From: Indu Bhagat Reply-To: Indu Bhagat 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?1769892870616914848?= X-GMAIL-MSGID: =?utf-8?q?1769892870616914848?= The linker will generate the output SFrame sections in the SFRAME_VERSION_2 format. If the input sections offered to the linker are not all in the SFRAME_VERSION_2 format, the linker issues an error to the user. bfd/ * elf-sframe.c (_bfd_elf_merge_section_sframe): Generate an output SFrame section with version SFRAME_VERSION_2. Also, error out if the SFrame sections do not all have SFRAME_VERSION_2. * elfxx-x86.c (_bfd_x86_elf_create_sframe_plt): Generate SFrame section for plt entries with version SFRAME_VERSION_2. ld/testsuite/ * ld-aarch64/sframe-simple-1.d: Adjust for SFRAME_VERSION_2. * ld-x86-64/sframe-plt-1.d: Likewise. * ld-x86-64/sframe-simple-1.d: Likewise. --- bfd/elf-sframe.c | 16 +++++++++++++++- bfd/elfxx-x86.c | 2 +- ld/testsuite/ld-aarch64/sframe-simple-1.d | 4 ++-- ld/testsuite/ld-x86-64/sframe-plt-1.d | 2 +- ld/testsuite/ld-x86-64/sframe-simple-1.d | 4 ++-- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/bfd/elf-sframe.c b/bfd/elf-sframe.c index c09822a5503..1b38768ec71 100644 --- a/bfd/elf-sframe.c +++ b/bfd/elf-sframe.c @@ -328,6 +328,8 @@ _bfd_elf_merge_section_sframe (bfd *abfd, uint8_t sfd_ctx_abi_arch; int8_t sfd_ctx_fixed_fp_offset; int8_t sfd_ctx_fixed_ra_offset; + uint8_t dctx_version; + uint8_t ectx_version; int encerr = 0; struct elf_link_hash_table *htab; @@ -361,7 +363,7 @@ _bfd_elf_merge_section_sframe (bfd *abfd, if (!sfd_ctx_abi_arch) return false; - htab->sfe_info.sfe_ctx = sframe_encode (SFRAME_VERSION_1, + htab->sfe_info.sfe_ctx = sframe_encode (SFRAME_VERSION_2, 0, /* SFrame flags. */ sfd_ctx_abi_arch, sfd_ctx_fixed_fp_offset, @@ -400,6 +402,18 @@ _bfd_elf_merge_section_sframe (bfd *abfd, return false; } + /* Check that all .sframe sections being linked have the same version. */ + dctx_version = sframe_decoder_get_version (sfd_ctx); + ectx_version = sframe_encoder_get_version (sfe_ctx); + if (dctx_version != SFRAME_VERSION_2 || dctx_version != ectx_version) + { + _bfd_error_handler + (_("input SFrame sections with different format versions prevent" + " .sframe generation")); + return false; + } + + /* Iterate over the function descriptor entries and the FREs of the function from the decoder context. Add each of them to the encoder context, if suitable. */ diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index b6512c9c49c..f224e8f1354 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -1883,7 +1883,7 @@ _bfd_x86_elf_create_sframe_plt (bfd *output_bfd, break; } - *ectx = sframe_encode (SFRAME_VERSION_1, + *ectx = sframe_encode (SFRAME_VERSION_2, 0, SFRAME_ABI_AMD64_ENDIAN_LITTLE, SFRAME_CFA_FIXED_FP_INVALID, diff --git a/ld/testsuite/ld-aarch64/sframe-simple-1.d b/ld/testsuite/ld-aarch64/sframe-simple-1.d index 6f617153a35..6ab8c2ab46a 100644 --- a/ld/testsuite/ld-aarch64/sframe-simple-1.d +++ b/ld/testsuite/ld-aarch64/sframe-simple-1.d @@ -3,14 +3,14 @@ #source: sframe-bar.s #objdump: --sframe=.sframe #ld: -shared -#name: SFrame Simple link +#name: SFrame simple link .*: file format .* Contents of the SFrame section .sframe: Header : - Version: SFRAME_VERSION_1 + Version: SFRAME_VERSION_2 Flags: SFRAME_F_FDE_SORTED Num FDEs: 2 Num FREs: 2 diff --git a/ld/testsuite/ld-x86-64/sframe-plt-1.d b/ld/testsuite/ld-x86-64/sframe-plt-1.d index 06bb16bd482..5e734610b97 100644 --- a/ld/testsuite/ld-x86-64/sframe-plt-1.d +++ b/ld/testsuite/ld-x86-64/sframe-plt-1.d @@ -10,7 +10,7 @@ Contents of the SFrame section .sframe: Header : - Version: SFRAME_VERSION_1 + Version: SFRAME_VERSION_2 Flags: SFRAME_F_FDE_SORTED #... diff --git a/ld/testsuite/ld-x86-64/sframe-simple-1.d b/ld/testsuite/ld-x86-64/sframe-simple-1.d index afc0006112e..7f4db31fe1b 100644 --- a/ld/testsuite/ld-x86-64/sframe-simple-1.d +++ b/ld/testsuite/ld-x86-64/sframe-simple-1.d @@ -3,14 +3,14 @@ #source: sframe-bar.s #objdump: --sframe=.sframe #ld: -shared -#name: SFrame Simple link +#name: SFrame simple link .*: +file format .* Contents of the SFrame section .sframe: Header : - Version: SFRAME_VERSION_1 + Version: SFRAME_VERSION_2 Flags: SFRAME_F_FDE_SORTED #...