From patchwork Mon Aug 2 04:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 44550 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 88CB3383A828 for ; Mon, 2 Aug 2021 13:08:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88CB3383A828 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1627909737; bh=VmJ3cOAm8eDUNRy0kNeCaWNJoXNErRBc+P3VjDmK3KM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=v0ZfRxi1HyVqxHZ7u/B2wcanx1Qn901GV5IHaobyg+JOfkcikfjKkZoM1Bcc9j9I7 k4HQsBOhT7D/3gIS83R9sUxpoOYhv22/+UN1Z1fXvQ2sRk4n/2rM9XBOLAFHihGaBo RIM6UWvio0Xr8zIebFUlQLjZVQrhkTMH6vschZkI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id 830CA3836001 for ; Mon, 2 Aug 2021 13:08:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 830CA3836001 Received: by mail-pj1-x102e.google.com with SMTP id k4-20020a17090a5144b02901731c776526so31589895pjm.4 for ; Mon, 02 Aug 2021 06:08:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VmJ3cOAm8eDUNRy0kNeCaWNJoXNErRBc+P3VjDmK3KM=; b=n8zzRRELli2nZdQqmaE9I6cs00zkv02c+ohnZZfeKFGxENK8Nl3FkqQ8tlMn9fHMaP nfDr0Im2IGLDR2QH2erxQZFJwq2U58B+HxovF0wjIwHh9MdOB/IGmgeIgcS9zNOul5un Sr72IJ37wVkoQdTpIHW3Apfgj+RbXqDQZcN9+1u8OgVsjKRUzmSwGJoL8ArXye99zlP2 BGSd6d4/bn0fvFy8hFK0sfg0b/yQbVIVFXIycsbHUtOCMNK/oSZsV5iGEdRCg5WbC2LZ NtbfOu6uee5R73lRWTZUxLghvD5ox6cFqflSlslQD9KFLdGPh8rERJVNQSW6EYgthkuC 23hQ== X-Gm-Message-State: AOAM531K1cq6pw2zyibHgnGID69evHCEPLD2wmjZDRIT3BbSqWLL6Dga S/2GSDkwpm1pjDyzufs3q0Dbx9fSvQM= X-Google-Smtp-Source: ABdhPJxYWKDuKULpkwbQarTMelXMjA9KMsCDYy6kUs3DjGSSJt2Qm1zpoQUaFeJbJTNPT+bNQvMrHw== X-Received: by 2002:a17:90b:1647:: with SMTP id il7mr14494478pjb.43.1627909713546; Mon, 02 Aug 2021 06:08:33 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.58.38.240]) by smtp.gmail.com with ESMTPSA id dw15sm10679769pjb.42.2021.08.02.06.08.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 06:08:33 -0700 (PDT) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 97C8EC0133 for ; Sun, 1 Aug 2021 21:29:40 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/2] Map ABI/VERSION of rtld to ABI/VERSION of ld [BZ #28132] Date: Sun, 1 Aug 2021 21:29:39 -0700 Message-Id: <20210802042940.932692-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3033.7 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Since the module name of ld is rtld, map ABI/VERSION of rtld to ABI/VERSION of ld. This fixes BZ #28132. --- scripts/abi-versions.awk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/abi-versions.awk b/scripts/abi-versions.awk index c369793459..09c9432f5c 100644 --- a/scripts/abi-versions.awk +++ b/scripts/abi-versions.awk @@ -27,6 +27,11 @@ $2 == "=" { printf "#define ABI_%s_%s\tABI_%s_%s\n", libid, oldid, libid, newid; printf "#define VERSION_%s_%s\t%s\n", libid, oldid, new; + if (libid == "ld") { + # The module name of ld is rtld. + printf "#define ABI_rtld_%s\tABI_ld_%s\n", oldid, oldid + printf "#define VERSION_rtld_%s\tVERSION_ld_%s\n", oldid, oldid + } next; } @@ -38,6 +43,11 @@ $2 == "=" { printf "#define ABI_%s_%s\t%d\t/* support %s */\n", libid, versid, ++n, vers; printf "#define VERSION_%s_%s\t%s\n", libid, versid, vers; + if (libid == "ld") { + # The module name of ld is rtld. + printf "#define ABI_rtld_%s\tABI_ld_%s\n", versid, versid + printf "#define VERSION_rtld_%s\tVERSION_ld_%s\n", versid, versid + } next; }