This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-718-gff8a695
- From: ppluzhnikov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 May 2012 21:02:01 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-718-gff8a695
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ff8a695b6d740e45b9e4b7ca454cdbca4f04ed7a (commit)
via b93d565a5117afc5dde458438d5d16621b9c4dd4 (commit)
from 0be196addae0e464aa32fcccc9d679c2f83f01b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ff8a695b6d740e45b9e4b7ca454cdbca4f04ed7a
commit ff8a695b6d740e45b9e4b7ca454cdbca4f04ed7a
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Wed May 2 14:01:37 2012 -0700
Kill trailing whitespace.
diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.S b/nptl/sysdeps/x86_64/pthread_spin_lock.S
index 5e3431c..b2acb61 100644
--- a/nptl/sysdeps/x86_64/pthread_spin_lock.S
+++ b/nptl/sysdeps/x86_64/pthread_spin_lock.S
@@ -16,7 +16,7 @@
<http://www.gnu.org/licenses/>. */
#include <lowlevellock.h>
-
+
.globl pthread_spin_lock
.type pthread_spin_lock,@function
.align 16
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b93d565a5117afc5dde458438d5d16621b9c4dd4
commit b93d565a5117afc5dde458438d5d16621b9c4dd4
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Wed May 2 13:58:40 2012 -0700
Avoid "anonymous" code in pthread_spin_lock.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index def7f2c..e3075ab 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-02 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * sysdeps/i386/pthread_spin_lock.S: New.
+ * sysdeps/i386/pthread_spin_lock.c: Delete.
+ * sysdeps/x86_64/pthread_spin_lock.S: New.
+ * sysdeps/x86_64/pthread_spin_lock.c: Delete.
+
2012-04-28 Andreas Schwab <schwab@linux-m68k.org>
* Makefile ($(objpfx)tst-stack3-mem, $(objpfx)tst-tls6.out): Don't
diff --git a/nptl/sysdeps/i386/pthread_spin_lock.c b/nptl/sysdeps/i386/pthread_spin_lock.S
similarity index 54%
copy from nptl/sysdeps/i386/pthread_spin_lock.c
copy to nptl/sysdeps/i386/pthread_spin_lock.S
index c059e01..ba9b18e 100644
--- a/nptl/sysdeps/i386/pthread_spin_lock.c
+++ b/nptl/sysdeps/i386/pthread_spin_lock.S
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,33 +15,23 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "pthreadP.h"
-
-#ifndef LOCK_PREFIX
-# ifdef UP
-# define LOCK_PREFIX /* nothing */
-# else
-# define LOCK_PREFIX "lock;"
-# endif
-#endif
-
-
-int
-pthread_spin_lock (lock)
- pthread_spinlock_t *lock;
-{
- asm ("\n"
- "1:\t" LOCK_PREFIX "decl %0\n\t"
- "jne 2f\n\t"
- ".subsection 1\n\t"
- ".align 16\n"
- "2:\trep; nop\n\t"
- "cmpl $0, %0\n\t"
- "jg 1b\n\t"
- "jmp 2b\n\t"
- ".previous"
- : "=m" (*lock)
- : "m" (*lock));
-
- return 0;
-}
+#include <lowlevellock.h>
+
+ .globl pthread_spin_lock
+ .type pthread_spin_lock,@function
+ .align 16
+pthread_spin_lock:
+ mov 4(%esp), %eax
+1: LOCK
+ decl 0(%eax)
+ jne 2f
+ xor %eax, %eax
+ ret
+
+ .align 16
+2: rep
+ nop
+ cmpl $0, 0(%eax)
+ jg 1b
+ jmp 2b
+ .size pthread_spin_lock,.-pthread_spin_lock
diff --git a/nptl/sysdeps/i386/pthread_spin_lock.c b/nptl/sysdeps/x86_64/pthread_spin_lock.S
similarity index 54%
rename from nptl/sysdeps/i386/pthread_spin_lock.c
rename to nptl/sysdeps/x86_64/pthread_spin_lock.S
index c059e01..5e3431c 100644
--- a/nptl/sysdeps/i386/pthread_spin_lock.c
+++ b/nptl/sysdeps/x86_64/pthread_spin_lock.S
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,33 +15,22 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "pthreadP.h"
-
-#ifndef LOCK_PREFIX
-# ifdef UP
-# define LOCK_PREFIX /* nothing */
-# else
-# define LOCK_PREFIX "lock;"
-# endif
-#endif
-
-
-int
-pthread_spin_lock (lock)
- pthread_spinlock_t *lock;
-{
- asm ("\n"
- "1:\t" LOCK_PREFIX "decl %0\n\t"
- "jne 2f\n\t"
- ".subsection 1\n\t"
- ".align 16\n"
- "2:\trep; nop\n\t"
- "cmpl $0, %0\n\t"
- "jg 1b\n\t"
- "jmp 2b\n\t"
- ".previous"
- : "=m" (*lock)
- : "m" (*lock));
-
- return 0;
-}
+#include <lowlevellock.h>
+
+ .globl pthread_spin_lock
+ .type pthread_spin_lock,@function
+ .align 16
+pthread_spin_lock:
+1: LOCK
+ decl 0(%rdi)
+ jne 2f
+ xor %eax, %eax
+ ret
+
+ .align 16
+2: rep
+ nop
+ cmpl $0, 0(%rdi)
+ jg 1b
+ jmp 2b
+ .size pthread_spin_lock,.-pthread_spin_lock
diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.c b/nptl/sysdeps/x86_64/pthread_spin_lock.c
deleted file mode 100644
index 7cf0e0e..0000000
--- a/nptl/sysdeps/x86_64/pthread_spin_lock.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i386/pthread_spin_lock.c"
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 7 +++
.../sysdeps/i386/pthread_spin_lock.S | 27 +++++++----
nptl/sysdeps/i386/pthread_spin_lock.c | 48 --------------------
.../sysdeps/x86_64/pthread_spin_lock.S | 26 +++++++----
nptl/sysdeps/x86_64/pthread_spin_lock.c | 1 -
5 files changed, 42 insertions(+), 67 deletions(-)
copy debug/poll_chk.c => nptl/sysdeps/i386/pthread_spin_lock.S (73%)
delete mode 100644 nptl/sysdeps/i386/pthread_spin_lock.c
copy debug/poll_chk.c => nptl/sysdeps/x86_64/pthread_spin_lock.S (74%)
delete mode 100644 nptl/sysdeps/x86_64/pthread_spin_lock.c
hooks/post-receive
--
GNU C Library master sources