From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id D7C8C385841A for ; Tue, 30 Aug 2022 16:39:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D7C8C385841A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-11eb44f520dso13774225fac.10 for ; Tue, 30 Aug 2022 09:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=7V0Y6NYeZ315QkEeItCW4i6E1jFqCOo4ZWHHy5HVLtk=; b=XdMHoN6jb4DSR/twmK4KKRM33Lx/ScwGKDp5mu3vGTAgw0AlUGibq3DcVGmhERGlag 3MyGVGI6zPnYrXtOMGZC3vHZLKbLcku/KIzXEmkOb8btomROQAPTIPRmQHOKQyUY7Igk 2vEFU/r8fqs7HDlLyIgzYMQRPNvsbHRIgKg8Mcojq+TqeQ2em0LS4Ea0rm06jeCiDmwy c2GTijT1pELOQyeTxZe9kkkuDGmH/d0vcbcHhEtdsi/O+1xyfu3/sz5KTtNchEMDRYS5 Q5pWte5o4OqbHxdz89H56MXlSG2fqRRPUkxJwF0EK+X1BvBN6orbgY2Q5G+NAi6o9Ph5 FSfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=7V0Y6NYeZ315QkEeItCW4i6E1jFqCOo4ZWHHy5HVLtk=; b=hUfnQqcF5+0wSaW7xR01Jg+VODybO2ldLT/w9qLhFV1K8/cBeWh8Hrr+nRI5XpkxrB Q3N9bIdaD4Tpb9FMg2EBwUopIu81wkWkWebllPgZ2f4hg9Ilc6K4jaFSqk5kMTYsqLRX kwMZAb8AAbQxxzFQt84035r9NP07eqKZ9j2tfPRfMwFqfXA2d45/IecBpD5Bi+WY53Ze BVLIr1xDR7dCRmbWmQ5moLwzU/KidfkbotF4uXQ3abdTK8ogr2meM+hsqYJYUB1UWmNA /rlsOACs48X2pSDztMUCokgTjulf/yIHL2X+dv7yQ9k59p+46gV60C2wSv8C2aRZk21r cRHg== X-Gm-Message-State: ACgBeo0LKFTQdEgmFx7C8y/3AhzTYeuQdQRvGpHIaCyNbzj5ruLT+cBP 3Ns3QdtGnto2OO3g5f6KgGDb0mg5qOgNLw== X-Google-Smtp-Source: AA6agR4lls+OTNi4G52vhpYGw/w1owf4HdzgMokAOxmQyoqceG9EpDc0cIGBp4u3rxh7svQQxWbSIQ== X-Received: by 2002:a05:6871:9b:b0:10b:c5d0:4377 with SMTP id u27-20020a056871009b00b0010bc5d04377mr10847957oaa.197.1661877549415; Tue, 30 Aug 2022 09:39:09 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:745e:31d8:f463:7d91:9d28]) by smtp.gmail.com with ESMTPSA id x9-20020a4ae789000000b0044b02c62872sm6924400oov.10.2022.08.30.09.39.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 09:39:09 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] elf: Restore how vDSO dependency is printed with LD_TRACE_LOADED_OBJECTS (BZ #29539) Date: Tue, 30 Aug 2022 13:39:05 -0300 Message-Id: <20220830163905.2578396-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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,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 List-Id: The d7703d3176d225d5743b21811d888619eba39e82 changed how vDSO like dependencies are printed, instead of just the name and address it follows other libraries mode and prints 'name => path'. Unfortunately, this broke some ldd consumer that uses the output to filter out the program's dependencies. For instance CMake bundleutilities module [1], where GetPrequirite uses the regex to filter out 'name => path' [2]. This patch restore the previous way to print just the name and the mapping address. Checked on x86_64-linux-gnu. [1] https://github.com/Kitware/CMake/tree/master/Tests/BundleUtilities [2] https://github.com/Kitware/CMake/blob/master/Modules/GetPrerequisites.cmake#L733 --- elf/rtld.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/elf/rtld.c b/elf/rtld.c index cbbaf4a331..3e771a93d8 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2122,6 +2122,12 @@ dl_main (const ElfW(Phdr) *phdr, if (l->l_faked) /* The library was not found. */ _dl_printf ("\t%s => not found\n", l->l_libname->name); + else if (strcmp (l->l_libname->name, l->l_name) == 0) + /* Print vDSO like libraries without duplicate name. Some + consumers depend of this format. */ + _dl_printf ("\t%s (0x%0*Zx)\n", l->l_libname->name, + (int) sizeof l->l_map_start * 2, + (size_t) l->l_map_start); else _dl_printf ("\t%s => %s (0x%0*Zx)\n", DSO_FILENAME (l->l_libname->name), -- 2.34.1