From patchwork Fri Jan 26 13:59:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 192601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp673280dyb; Fri, 26 Jan 2024 05:59:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IEbBa3uPFy3KKX9rne8kenoAMY6lrWnbqLtSKhUyDTIKvkQEgJMaVIuedpzaLr4AZFsmtUN X-Received: by 2002:a05:6808:1285:b0:3bd:d34f:787b with SMTP id a5-20020a056808128500b003bdd34f787bmr1701179oiw.76.1706277569775; Fri, 26 Jan 2024 05:59:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706277569; cv=pass; d=google.com; s=arc-20160816; b=csrAXYqM8j27iUeggJ270uNR9GqD1fS5SlwhxuQ3CrMH6SA/dvbXVuJfY7yb60sd1F vdUAyYflhGQ/ARdIDQEmb5+BKlJijbWlyTe04TcwjKAZoi28Bj/sKL8yBR/f0k6LWKGY 3z0viQq3xS72MXVgvssJGdI6GNO9C55x0Jyoflq5J311z/7ndh1Dqdpl/fhgvGm3WokB OWLIqwnWEVZywL6fn9EGBl3dfkOktPXntB/yhpXm0bu41AMG4jfgO/PtPDypPImICMz+ qRDAnBotMU9TlnpwmOlA2MA9lQSN5Q+IVhE4BWoWYzGZrCHm077ydD++WtJBTi3OY0xi fvZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=JgcWWKGaDu+lb36yQvuNZNawoXTYmlq7iM0roPiSY4w=; fh=hOVy4UVxws0FZH3PKb6RSJlu5aRnKpFfZ6iAYtZs944=; b=eVLJJ+RrAxSp9lQCGw5tn5SkkA47A0UKCYkRGWQvXZo9TCe+cISKtDZ34uLcbGIE3n 9ZkhPGLje4NXPosQnnnyRSYXhcq+VeDRc1Sz+Gb+mtsR4t4rJLvHKlZTj6ppCtU3ac09 JVHBkfDgOyDXUEKmUAs2aVTnxQzj8p7gtN0aDRPXC0djRsYWythpCbcn1Vm/ocFi9M8W CWvYJVHvgZpDWQPq9swpmk9dssb5Xgpoq/r6wh7AiCbq3FOFC3CQM2ekjnJhQEKurnsP g0rp4d+sNbxOjhGPJrSO9eA0xaqq8mVMiKn3HuBFfxESCq1uXPufO6MrnhD93ti6Kg9n z05g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="e/Chryk+"; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b2-20020a05620a126200b007831a33374bsi1391038qkl.461.2024.01.26.05.59.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 05:59:29 -0800 (PST) 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=@gmail.com header.s=20230601 header.b="e/Chryk+"; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 749D03858D33 for ; Fri, 26 Jan 2024 13:59:29 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id 93A353858D33 for ; Fri, 26 Jan 2024 13:59:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 93A353858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 93A353858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706277559; cv=none; b=cka3wAF2PQXfq6xqVwYI5LfdYt1g86RTFAD0KgIC4TXkDxcdjb+2+PNGmutzwbsltMgk14/uJsRVBspwX3pZ9ZnrPYiBYj0b9VGrIaM4GwvP9jXLZz6+C8ucz1kP73gdme5ozjsIa531L/8/kYSgAeluozukHYm2MDueR0S0NR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706277559; c=relaxed/simple; bh=4e3aVBqFncQnoLYNq0dK1bjM6ws/N2mwrRq8lbjOIbo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=w3SUQtoSNGxfSPAYpGC2npmwq2rckdt2oHXSE3hoId7qr4obypn+9T0KHy4UqtlOTWkeQDn2TcbT4Tfhcq9+i03A35Dfn+wKPD2LC1dMicweCvoBB/c+s6yzG/rb+eUoY3oOV105BXjvscBnSbQibAPLY887eGebPe/nKmhDBHA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-5d4a1e66750so555989a12.0 for ; Fri, 26 Jan 2024 05:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706277556; x=1706882356; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JgcWWKGaDu+lb36yQvuNZNawoXTYmlq7iM0roPiSY4w=; b=e/Chryk+Asi2hcQahya62lTROdQ+g7+NOgtSAMDWSthdPYHdjvHWkCGqmfW4+iNvif fP2fC2zskAKqlYXyfrAzblAsMU3yizGwSxUGDDiwP50Zir81YFzrRbOB5DyDhDzo23KD R0d1Hj5Y73TUJGyPvsX5urLmAJzVrPU2+ejP7WrldnZP2WRrFNIwnpZ6gSOmaPmIeEsR g2FqxCyckKEEK0a4b8CTSOxO+DuI3HRRN98DT7Gf+8fDz9RXpe8xUzLpD04h2Ke58FVJ CiC06v0jeuSeFy2iLhJGcmiJPS1nxKRdFVBJa0te/I2ShEhP1+H8wnT18Wblwd612bhX zAxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706277556; x=1706882356; 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=JgcWWKGaDu+lb36yQvuNZNawoXTYmlq7iM0roPiSY4w=; b=OqI83kE5S/CGhKWhKSnPRfSF7MgN8X0mu1AoTophUNE71PWYQHp/Vvyxy1XJ/e4KuS RR8TXEmk1pUYDVxg0iLbqxs+i8KhWm2ttS2ZGYI9TNk7m9v1k0gAeMorfys+jo4TDhBh xSkJYFhKgAf7ib8LOsNtQ3rZcRIp/KaONUCYYQFZV2e54PHG3qVzoYQD1WzYMzU2s7N8 spgcygdS6tREMh5igbleZNZR96JGnNONFZFmurSp/7d/JBo7Qe1AzGMGmpkbSQokKKdL 2CBjyq2MGcL7Mc8Us+Nisn2n7yrYwuiniDdox18iJGxDWTXpPFIc5F+QroZyR/nfvjeu iz6Q== X-Gm-Message-State: AOJu0Yx2z9f2iQhgAPvrgo/dwHXmFMcCTEFniCJ4KQfiVi1x9+/z5LGo A30MFXQ4AoIU8vylbf3gpU0rLAeeiSAoQZG9uSHViQeXmBof7pp7NunwwkYX X-Received: by 2002:a05:6a20:c856:b0:19a:b670:1b94 with SMTP id ha22-20020a056a20c85600b0019ab6701b94mr922569pzb.110.1706277556333; Fri, 26 Jan 2024 05:59:16 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.51]) by smtp.gmail.com with ESMTPSA id e7-20020aa79807000000b006da96503d9fsm1094848pfl.109.2024.01.26.05.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 05:59:16 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id B34DC74013F; Fri, 26 Jan 2024 05:59:14 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Cc: nickc@redhat.com Subject: [PATCH] elf: Rename is_standard_elf to uses_elf_em Date: Fri, 26 Jan 2024 05:59:14 -0800 Message-ID: <20240126135914.2400826-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3024.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789161708978965844 X-GMAIL-MSGID: 1789161708978965844 Rename is_standard_elf to uses_elf_em for targets which use elf.em. binutils/ PR ld/31289 * testsuite/lib/binutils-common.exp (is_standard_elf): Renamed to ... (uses_elf_em): This. ld/ PR ld/31289 * testsuite/ld-elf/fatal-warnings-2a.d: Replace is_standard_elf with uses_elf_em. * testsuite/ld-elf/fatal-warnings-2b.d: Likewise. * testsuite/ld-elf/fatal-warnings-3a.d: Likewise. * testsuite/ld-elf/fatal-warnings-3b.d: Likewise. * testsuite/ld-elf/fatal-warnings-4a.d: Likewise. * testsuite/ld-elf/fatal-warnings-4b.d: Likewise. --- binutils/testsuite/lib/binutils-common.exp | 4 ++-- ld/testsuite/ld-elf/fatal-warnings-2a.d | 2 +- ld/testsuite/ld-elf/fatal-warnings-2b.d | 2 +- ld/testsuite/ld-elf/fatal-warnings-3a.d | 2 +- ld/testsuite/ld-elf/fatal-warnings-3b.d | 2 +- ld/testsuite/ld-elf/fatal-warnings-4a.d | 2 +- ld/testsuite/ld-elf/fatal-warnings-4b.d | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index b304801e718..2fca43bac48 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -275,8 +275,8 @@ proc is_generic { } { return 0 } -# Return true if target uses the standard ELF emulation. -proc is_standard_elf { } { +# Return true if target uses elf.em. +proc uses_elf_em { } { if { ![is_elf_format] || [is_generic] } { return 0 } diff --git a/ld/testsuite/ld-elf/fatal-warnings-2a.d b/ld/testsuite/ld-elf/fatal-warnings-2a.d index b17abb1b274..55a0abe126e 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-2a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-2a.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 #warning: -z bad-option1 ignored -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-2b.d b/ld/testsuite/ld-elf/fatal-warnings-2b.d index 7aedb531dd4..701e4fb7c97 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-2b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-2b.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 #warning: -z bad-option2 ignored -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-3a.d b/ld/testsuite/ld-elf/fatal-warnings-3a.d index 1b52f8fe0c5..0a31a733e50 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-3a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-3a.d @@ -2,5 +2,5 @@ #source: start.s #ld: --fatal-warnings -z bad-option1 -z bad-option2 #error: unsupported option: -z bad-option1 -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-3b.d b/ld/testsuite/ld-elf/fatal-warnings-3b.d index 870a1eb2fea..7ab86168c62 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-3b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-3b.d @@ -2,5 +2,5 @@ #source: start.s #ld: --fatal-warnings -z bad-option1 -z bad-option2 #error: unsupported option: -z bad-option2 -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-4a.d b/ld/testsuite/ld-elf/fatal-warnings-4a.d index cf7373b4625..6befcda9c55 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-4a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-4a.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 --fatal-warnings #error: unsupported option: -z bad-option1 -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-4b.d b/ld/testsuite/ld-elf/fatal-warnings-4b.d index 7cdb2b4db7a..072993265db 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-4b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-4b.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 --fatal-warnings #error: unsupported option: -z bad-option2 -#xfail: ![is_standard_elf] +#xfail: ![uses_elf_em] # These targets don't support -z options.