From patchwork Wed Jun 24 11:21:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39781 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 618B13987024; Wed, 24 Jun 2020 11:21:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 618B13987024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592997713; bh=yDnZp3a7s4WVzb9EiIMAX/b1QWVLt+K3SMpVATIF2Oc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=pxhiy5XmZRyLlCfj41sCEo7KyqKt4YSHv7mu3XGazmi9dMrH6igSUV7gq62H7dZ/L 3ho+P212AM1Pe/tiSrW8ca87FiSQNSR/qXVLEiF3gRilS74WM+HJkYVhoDiUbQRwBD ADCtNzO9YtWGAE6RkbXa+ledamukgqSXri0nNdCw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 6D511393C88C for ; Wed, 24 Jun 2020 11:21:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6D511393C88C 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-93-qQnEOxXbO0KyFAmYEGDMEg-1; Wed, 24 Jun 2020 07:21:49 -0400 X-MC-Unique: qQnEOxXbO0KyFAmYEGDMEg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F4281005512; Wed, 24 Jun 2020 11:21:48 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-113-18.ams2.redhat.com [10.36.113.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D8E379305; Wed, 24 Jun 2020 11:21:47 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] htl: Add wrapper header for with hidden __sem_post Date: Wed, 24 Jun 2020 13:21:46 +0200 Message-ID: <87eeq4d7zp.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, RCVD_IN_MSPIKE_H3, 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 Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This is required to avoid a check-localplt failure due to a sem_post call through the PLT. Reviewed-by: Samuel Thibault --- sysdeps/htl/include/semaphore.h | 9 +++++++++ sysdeps/htl/sem-post.c | 2 +- sysdeps/htl/sem-timedwait.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sysdeps/htl/include/semaphore.h b/sysdeps/htl/include/semaphore.h new file mode 100644 index 0000000000..58fa2bf341 --- /dev/null +++ b/sysdeps/htl/include/semaphore.h @@ -0,0 +1,9 @@ +#ifndef _SEMAPHORE_H +#include_next + +#ifndef _ISOMAC +extern __typeof (sem_post) __sem_post; +libpthread_hidden_proto (__sem_post) +#endif + +#endif diff --git a/sysdeps/htl/sem-post.c b/sysdeps/htl/sem-post.c index fd0c6338c6..720b73a059 100644 --- a/sysdeps/htl/sem-post.c +++ b/sysdeps/htl/sem-post.c @@ -64,5 +64,5 @@ __sem_post (sem_t *sem) return 0; } - +libpthread_hidden_def (__sem_post) strong_alias (__sem_post, sem_post); diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c index fffdf36467..5095d49b28 100644 --- a/sysdeps/htl/sem-timedwait.c +++ b/sysdeps/htl/sem-timedwait.c @@ -167,7 +167,7 @@ out_locked: { if (ret == 0 && ctx.cancel_wake == 0) /* We were cancelled while waking up with a token, put it back. */ - sem_post (sem); + __sem_post (sem); __pthread_exit (PTHREAD_CANCELED); }