From patchwork Wed May 19 18:05:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43510 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 8D0223951832; Wed, 19 May 2021 18:05:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D0223951832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621447528; bh=OqFUVZCA6jwFsD87fPprJZpEKOoPPVtHgQDhhPHr0Is=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=An/KE1QC2wy7vFGpQzdb111kHwBBKh1SdiNCPy3+CVFvxqtp2LnsVkNsp+utE/0T1 PqJHT98zZL3EIe4VU+Zz7G6weLYqZZ3fb1F+9uUTVGeROxeapGfyiUyFhWttSiiobP DPfXLCAluq8ULU/qwzhTxESEfw3DSelYfPG5ZZRg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 827593951832 for ; Wed, 19 May 2021 18:05:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 827593951832 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-BygSz8wOOCCwYd3Buc0Vgg-1; Wed, 19 May 2021 14:05:23 -0400 X-MC-Unique: BygSz8wOOCCwYd3Buc0Vgg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C570319253C2 for ; Wed, 19 May 2021 18:05:22 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B5C260C03 for ; Wed, 19 May 2021 18:05:21 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 13/14] dlfcn: Eliminate GLIBC_PRIVATE dependency from tststatic2 In-Reply-To: References: X-From-Line: 4099ccd0d163c2064cb126632bfa2933732592d6 Mon Sep 17 00:00:00 2001 Message-Id: <4099ccd0d163c2064cb126632bfa2933732592d6.1621446837.git.fweimer@redhat.com> Date: Wed, 19 May 2021 20:05:20 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The test appears to use _dlfcn_hook@@GLIBC_PRIVATE as a way to test dlvsym without having to know the appropriate symbol version. With , we can use a public symbol and the symbol version at which it was defined first. --- dlfcn/modstatic2.c | 3 ++- dlfcn/tststatic2.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlfcn/modstatic2.c b/dlfcn/modstatic2.c index 9b5aae8b9f..34568d4e6e 100644 --- a/dlfcn/modstatic2.c +++ b/dlfcn/modstatic2.c @@ -4,6 +4,7 @@ #include #include #include +#include int test (FILE *out, int a); @@ -117,7 +118,7 @@ test (FILE *out, int a) exit (1); } - if (dlvsym (handle2, "_dlfcn_hook", "GLIBC_PRIVATE") == NULL) + if (dlvsym (handle2, "malloc", FIRST_VERSION_libc_malloc_STRING) == NULL) { fprintf (out, "dlvsym: %s\n", dlerror ()); exit (1); diff --git a/dlfcn/tststatic2.c b/dlfcn/tststatic2.c index f8cd5a964b..ba4648e521 100644 --- a/dlfcn/tststatic2.c +++ b/dlfcn/tststatic2.c @@ -4,6 +4,7 @@ #include #include #include +#include static int do_test (void) @@ -115,7 +116,7 @@ do_test (void) exit (1); } - if (dlvsym (handle2, "_dlfcn_hook", "GLIBC_PRIVATE") == NULL) + if (dlvsym (handle2, "malloc", FIRST_VERSION_libc_malloc_STRING) == NULL) { printf ("dlvsym: %s\n", dlerror ()); exit (1);