From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 6F78C3858D28; Mon, 6 Dec 2021 08:27:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F78C3858D28 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] misc, nptl: Remove stray references to __condvar_load_64_relaxed X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 4fb4e7e821e36180835bf88e363f9f13b5797e3a X-Git-Newrev: 68007900beef12000ed90f38c251eaf32fbc0490 Message-Id: <20211206082744.6F78C3858D28@sourceware.org> Date: Mon, 6 Dec 2021 08:27:44 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2021 08:27:44 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=68007900beef12000ed90f38c251eaf32fbc0490 commit 68007900beef12000ed90f38c251eaf32fbc0490 Author: Florian Weimer Date: Mon Dec 6 08:01:08 2021 +0100 misc, nptl: Remove stray references to __condvar_load_64_relaxed The function was renamed to __atomic_wide_counter_load_relaxed in commit 8bd336a00a5311bf7a9e99b3b0e9f01ff5faa74b ("nptl: Extract from pthread_cond_common.c"). Diff: --- misc/atomic_wide_counter.c | 4 ++-- nptl/pthread_cond_common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/atomic_wide_counter.c b/misc/atomic_wide_counter.c index 56d8981925..6d395197e7 100644 --- a/misc/atomic_wide_counter.c +++ b/misc/atomic_wide_counter.c @@ -72,11 +72,11 @@ __atomic_wide_counter_fetch_add_relaxed (__atomic_wide_counter *c, add operations are ordered in happens-before. */ h++; /* S2. Release MO to synchronize with the loads of the higher-order half - in the load operation. See __condvar_load_64_relaxed. */ + in the load operation. See __atomic_wide_counter_load_relaxed. */ atomic_store_release (&c->__value32.__high, h | ((unsigned int) 1 << 31)); l ^= (unsigned int) 1 << 31; - /* S3. See __condvar_load_64_relaxed. */ + /* S3. See __atomic_wide_counter_load_relaxed. */ atomic_store_release (&c->__value32.__low, l); /* S4. Likewise. */ atomic_store_release (&c->__value32.__high, h); diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c index fb56f93b6e..78e8738210 100644 --- a/nptl/pthread_cond_common.c +++ b/nptl/pthread_cond_common.c @@ -75,7 +75,7 @@ __condvar_fetch_xor_wseq_release (pthread_cond_t *cond, unsigned int val) static uint64_t __attribute__ ((unused)) __condvar_fetch_xor_wseq_release (pthread_cond_t *cond, unsigned int val) { - /* First, get the current value. See __condvar_load_64_relaxed. */ + /* First, get the current value. See __atomic_wide_counter_load_relaxed. */ unsigned int h, l, h2; do {