From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by sourceware.org (Postfix) with ESMTPS id E3CD73840C28 for ; Fri, 5 Mar 2021 11:49:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E3CD73840C28 Received: by mail-qv1-xf36.google.com with SMTP id k7so798658qvo.6 for ; Fri, 05 Mar 2021 03:49:14 -0800 (PST) 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=xmGPGF4FcizTVCG/vwUPvHjZY95chpy0WAZtWtFrEcY=; b=OWcKXZ3aFl3EmHm1sS3/L9NB0tAYssqf1APuJda38XDtkrcvXIY02rOluEPM5fMtP2 eJQI82Ef59RL8M7bn2ew1gD4Su3nZBo/NAGgJsBCfX4DrxO+OWWzLZOnMJW+0uhc7rlJ ikzu9+ZKqzXtkJkjdEDvvVxYwNXHc87iWx/iRqDk62UyFKHtHTKGKkIM8znyhurn/BLj Aqe01GAuSRpW7fdybDzRA6rI5bafYmyRtmqcKCF7oVaBz7toar0IsrJWfSsquv8JAAAK OTdgaE9dxVvI+Re1P8z+5vK9QNJxdl1hiFH3xrLvKlmoU9lkTVXhiskklGW2xomdZzYG 6+kA== X-Gm-Message-State: AOAM532EY0QtekIVLiIeReLygFb/Fqd5nGMDnSRMDjewSPiR4IO/BI3a jcVZNW8NyKHIAKHDiEUFAqo+9oB6VTdGRw== X-Google-Smtp-Source: ABdhPJxpm+9LsSog1s79ObXK7aOSJI2aVVpmqSQ0Fbg+8WjeYlPZN9WGoEHZdOL+d2EPqvvJU2GqPQ== X-Received: by 2002:a0c:c193:: with SMTP id n19mr8246556qvh.3.1614944954397; Fri, 05 Mar 2021 03:49:14 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e3sm1672571qtj.28.2021.03.05.03.49.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 03:49:14 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED 4/4] nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto Date: Fri, 5 Mar 2021 08:49:06 -0300 Message-Id: <20210305114906.122952-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 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 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-List-Received-Date: Fri, 05 Mar 2021 11:49:16 -0000 They are both implemented in libpthread instead of libc. --- nptl/pthreadP.h | 4 ++-- nptl/pthread_clockjoin.c | 2 +- nptl/pthread_timedjoin.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 93f3cef00f..c8538de44f 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -469,10 +469,10 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex); extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, clockid_t clockid, const struct __timespec64 *abstime); -libc_hidden_proto (__pthread_clockjoin_np64) +libpthread_hidden_proto (__pthread_clockjoin_np64) extern int __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, const struct __timespec64 *abstime); -libc_hidden_proto (__pthread_timedjoin_np64) +libpthread_hidden_proto (__pthread_timedjoin_np64) extern int __pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct __timespec64 *abstime); diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c index c55ab8bd09..7457c187fe 100644 --- a/nptl/pthread_clockjoin.c +++ b/nptl/pthread_clockjoin.c @@ -32,7 +32,7 @@ __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, } #if __TIMESIZE != 64 -libc_hidden_def (__pthread_clockjoin_np64) +libpthread_hidden_def (__pthread_clockjoin_np64) int __pthread_clockjoin_np (pthread_t threadid, void **thread_return, diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c index 282483cc49..f5d0d3d6ce 100644 --- a/nptl/pthread_timedjoin.c +++ b/nptl/pthread_timedjoin.c @@ -28,7 +28,7 @@ __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, } #if __TIMESIZE != 64 -libc_hidden_def (__pthread_timedjoin_np64) +libpthread_hidden_def (__pthread_timedjoin_np64) int __pthread_timedjoin_np (pthread_t threadid, void **thread_return, -- 2.25.1