From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 788583858D32 for ; Thu, 6 Oct 2022 16:39:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 788583858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665074349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5eWBymF728o0sZpcSpEDgW0WLRZJPMUuK7Q4seod+HI=; b=EhAd8InZPGm3MlPJWPDBvHykk0BEqmDtIQc3WyuRbC/BP5fhx7I+tI/YmRV43V59JkMEUI 6SdVPqOtEeByacWy7BAomClg6+6C0PktnR4mS38doy/+qm3iiZLaNQPl9zw8RPLEMBtYBa PXedlBTxOfUgCOXPOmQUAtEyDqqpBQ0= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-661-AVxquqkVMGmDeLJ_hIDmDA-1; Thu, 06 Oct 2022 12:39:08 -0400 X-MC-Unique: AVxquqkVMGmDeLJ_hIDmDA-1 Received: by mail-qt1-f200.google.com with SMTP id l11-20020ac848cb000000b0038f4394d93aso1434473qtr.21 for ; Thu, 06 Oct 2022 09:39:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5eWBymF728o0sZpcSpEDgW0WLRZJPMUuK7Q4seod+HI=; b=PvFu+/c41bJCt8KC/o9ak6E5n4E5iqQe8rieWn0b38hKMdu6oi2HFVpvh4gZDJlh23 8+5s7ChaNxcJh5+4R2LCpiRdLLq2aFFElmZR9sg+wcEIxQdtjg725+rqMEAdp5RMVkc6 DusfXGIvuiap9kxYwJl8ay06QXJFhZeOKVb9/kKao5xWwq+eGAX5/LAHxiMjGhSrhkzA l1k+DteH37c3ztgYM7pHFBuk8F+8S5CUlE9CXu73VrwAOjhH0hzi6Dos3MwTe3kWUDsG cmS0g4Qo9HI4EfX6vYi+uExQM+lZc+Vp8KO62r9wfb2rwHcX8LtMPio1rE+Hf9j3JkTT Kzlg== X-Gm-Message-State: ACrzQf1UPzp29438F7WgQNqtqy3AuaYbS3H1GGwQ9YvmgqvbbO2mBUU+ NA3Df0J/h9qT73lowGqlt4lNWY5oOsb//oRdcSZ6ffEWB70PgYTX5aKi4P8RxVV5FxHRri/dLoD 16D3P1iyN5cjuQjJUKuCv X-Received: by 2002:a05:6214:20a6:b0:4ac:ba17:e20f with SMTP id 6-20020a05621420a600b004acba17e20fmr641049qvd.101.1665074347116; Thu, 06 Oct 2022 09:39:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WAEUtXrwerpOVL81Cc5YV6o+grkA7UNCNGAGl28POpaiqMuSPp+2MGn5zxpqcnbz1t8Ic/A== X-Received: by 2002:a05:6214:20a6:b0:4ac:ba17:e20f with SMTP id 6-20020a05621420a600b004acba17e20fmr641033qvd.101.1665074346840; Thu, 06 Oct 2022 09:39:06 -0700 (PDT) Received: from fedora ([66.187.232.65]) by smtp.gmail.com with ESMTPSA id m16-20020a05620a291000b006c73c3d288esm20388567qkp.131.2022.10.06.09.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 09:39:01 -0700 (PDT) Date: Thu, 6 Oct 2022 12:38:59 -0400 From: Carlos O'Donell To: "H.J. Lu" Cc: libc-alpha@sourceware.org Subject: Re: [PATCH 1/2] Map ABI/VERSION of rtld to ABI/VERSION of ld [BZ #28132] Message-ID: References: <20210802042940.932692-1-hjl.tools@gmail.com> MIME-Version: 1.0 In-Reply-To: <20210802042940.932692-1-hjl.tools@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 Sun, Aug 01, 2021 at 09:29:39PM -0700, H.J. Lu via Libc-alpha wrote: > Since the module name of ld is rtld, map ABI/VERSION of rtld to ABI/VERSION > of ld. This fixes BZ #28132. Reviewing old patches that are still outstanding as part of the queue review in patchwork. Hopefully we catch up to the point where I'm not reviewing year old patches in the queue. However, some of these patches are interesting and valuable so I'm reviving them to review potential solutions. In scripts/gen-libc-modules.awk we have this code: 21 if (name == "ld") 22 name = "rtld" This means we are already handling this processing in other places. A clean solution needs to consider: scripts/abi-version.awk (no changes, should just use rtld) scripts/gen-libc-modules.awk (ld vs rtld) shlib-versions (ld=...) It feels like we need to refactor from the top just use rtld everywhere we accidentally used ld as our identifier. > --- > 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; > } > > -- > 2.31.1 >