[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: hurd: Restore march version _pthread_spin_lock



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit fd76a49313eb7dbe51a86304e067be5913c0b190
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Nov 6 13:39:07 2016 +0100

    hurd: Restore march version _pthread_spin_lock
    
    to further reduce the disruption of using gsync in pthread_spin_lock
---
 .../hurd-i386/tg-libpthread-gsync-spin.diff        | 45 ++++------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/debian/patches/hurd-i386/tg-libpthread-gsync-spin.diff b/debian/patches/hurd-i386/tg-libpthread-gsync-spin.diff
index 7436286..0462e4f 100644
--- a/debian/patches/hurd-i386/tg-libpthread-gsync-spin.diff
+++ b/debian/patches/hurd-i386/tg-libpthread-gsync-spin.diff
@@ -1,4 +1,4 @@
-commit eccb1958dd0f8eb9d4ce15d7350ef16c0608d4f2
+commit 2d2ca1268f863437bad07c6abbbc23f33bbfe9f1
 Author: Agustina Arzille <avarzille@riseup.net>
 Date:   Tue Oct 18 00:20:45 2016 +0200
 
@@ -239,44 +239,13 @@ index 5ae81e1..0000000
 -
 -#endif /* bits/spin-lock.h */
 diff --git a/libpthread/sysdeps/mach/pt-spin.c b/libpthread/sysdeps/mach/pt-spin.c
-deleted file mode 100644
-index d9a2a32..0000000
+index d9a2a32..0f49ca3 100644
 --- a/libpthread/sysdeps/mach/pt-spin.c
-+++ /dev/null
-@@ -1,36 +0,0 @@
--/* Spin locks.  Mach version.
--   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Library General Public License as
--   published by the Free Software Foundation; either version 2 of the
--   License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Library General Public License for more details.
--
--   You should have received a copy of the GNU Library General Public
--   License along with the GNU C Library; see the file COPYING.LIB.  If not,
--   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--   Boston, MA 02111-1307, USA.  */
--
--#include <pthread.h>
--#include <machine-lock.h>
--
--/* In glibc.  */
--extern void __spin_lock_solid (__pthread_spinlock_t *lock);
--
--/* Lock the spin lock object LOCK.  If the lock is held by another
--   thread spin until it becomes available.  */
--int
--_pthread_spin_lock (__pthread_spinlock_t *lock)
--{
--  __spin_lock_solid (lock);
--  return 0;
--}
++++ b/libpthread/sysdeps/mach/pt-spin.c
+@@ -31,6 +31,3 @@ _pthread_spin_lock (__pthread_spinlock_t *lock)
+   __spin_lock_solid (lock);
+   return 0;
+ }
 -
 -weak_alias (_pthread_spin_lock, pthread_spin_lock);
 -weak_alias (_pthread_spin_lock, __pthread_spin_lock);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: