This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-668-g0d749bb

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  0d749bbebad48b4c673a29af03d5c5dd151881de (commit)
      from  4060283decf711ed95a6c4993ffeaba39f8cd40a (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0d749bbebad48b4c673a29af03d5c5dd151881de

commit 0d749bbebad48b4c673a29af03d5c5dd151881de
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Jun 24 19:17:43 2014 -0700

    x86: Consolidate unnecessary nptl/ subdirectories.

diff --git a/ChangeLog b/ChangeLog
index ce6c4d8..d953753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2014-06-24  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/i386/i486/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i486/pthread_spin_trylock.S: ... here.
+	* sysdeps/i386/i586/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i586/pthread_spin_trylock.S: ... here.
+	Update #include.
+	* sysdeps/i386/i686/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/i386/i686/pthread_spin_trylock.S: ... here.
+	Update #include.
+	* sysdeps/x86_64/64/nptl/shlib-versions: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: ... here.
+	* sysdeps/x86_64/x32/nptl/shlib-versions: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: ... here.
+	* sysdeps/x86/nptl/bits/pthreadtypes.h: Moved ...
+	* sysdeps/x86/bits/pthreadtypes.h: ... here.
+	* sysdeps/x86/nptl/bits/semaphore.h: Moved ...
+	* sysdeps/x86/bits/semaphore.h: ... here.
+	* sysdeps/x86/nptl/elide.h: Moved ...
+	* sysdeps/x86/elide.h: ... here.
+	* sysdeps/x86_64/nptl/Implies: File removed.
+	* sysdeps/i386/nptl/Implies: File removed.
+
 2014-06-24  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #16539]
diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S
similarity index 100%
rename from sysdeps/i386/i486/nptl/pthread_spin_trylock.S
rename to sysdeps/i386/i486/pthread_spin_trylock.S
diff --git a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S
deleted file mode 100644
index a0c90b5..0000000
--- a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S
new file mode 100644
index 0000000..0cf8b3a
--- /dev/null
+++ b/sysdeps/i386/i586/pthread_spin_trylock.S
@@ -0,0 +1 @@
+#include <sysdeps/i386/i486/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S
similarity index 93%
rename from sysdeps/i386/i686/nptl/pthread_spin_trylock.S
rename to sysdeps/i386/i686/pthread_spin_trylock.S
index d02f490..79eed31 100644
--- a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S
+++ b/sysdeps/i386/i686/pthread_spin_trylock.S
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_CMOV	1
-#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>
+#include <sysdeps/i386/i486/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/nptl/Implies b/sysdeps/i386/nptl/Implies
deleted file mode 100644
index e454b28..0000000
--- a/sysdeps/i386/nptl/Implies
+++ /dev/null
@@ -1 +0,0 @@
-x86/nptl
diff --git a/sysdeps/x86_64/64/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
similarity index 100%
rename from sysdeps/x86_64/64/nptl/shlib-versions
rename to sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
diff --git a/sysdeps/x86_64/x32/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
similarity index 100%
rename from sysdeps/x86_64/x32/nptl/shlib-versions
rename to sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/x86/nptl/bits/pthreadtypes.h
rename to sysdeps/x86/bits/pthreadtypes.h
diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h
similarity index 100%
rename from sysdeps/x86/nptl/bits/semaphore.h
rename to sysdeps/x86/bits/semaphore.h
diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h
similarity index 100%
rename from sysdeps/x86/nptl/elide.h
rename to sysdeps/x86/elide.h
diff --git a/sysdeps/x86_64/nptl/Implies b/sysdeps/x86_64/nptl/Implies
deleted file mode 100644
index e454b28..0000000
--- a/sysdeps/x86_64/nptl/Implies
+++ /dev/null
@@ -1 +0,0 @@
-x86/nptl

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   23 ++++++++++++++++++++
 .../i386/i486/{nptl => }/pthread_spin_trylock.S    |    0
 sysdeps/i386/i586/nptl/pthread_spin_trylock.S      |    1 -
 sysdeps/i386/i586/pthread_spin_trylock.S           |    1 +
 .../i386/i686/{nptl => }/pthread_spin_trylock.S    |    2 +-
 sysdeps/i386/nptl/Implies                          |    1 -
 .../sysv/linux/x86_64/64}/shlib-versions           |    0
 .../sysv/linux/x86_64/x32}/shlib-versions          |    0
 sysdeps/x86/{nptl => }/bits/pthreadtypes.h         |    0
 sysdeps/x86/{nptl => }/bits/semaphore.h            |    0
 sysdeps/x86/{nptl => }/elide.h                     |    0
 sysdeps/x86_64/nptl/Implies                        |    1 -
 12 files changed, 25 insertions(+), 4 deletions(-)
 rename sysdeps/i386/i486/{nptl => }/pthread_spin_trylock.S (100%)
 delete mode 100644 sysdeps/i386/i586/nptl/pthread_spin_trylock.S
 create mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S
 rename sysdeps/i386/i686/{nptl => }/pthread_spin_trylock.S (93%)
 delete mode 100644 sysdeps/i386/nptl/Implies
 rename sysdeps/{x86_64/64/nptl => unix/sysv/linux/x86_64/64}/shlib-versions (100%)
 rename sysdeps/{x86_64/x32/nptl => unix/sysv/linux/x86_64/x32}/shlib-versions (100%)
 rename sysdeps/x86/{nptl => }/bits/pthreadtypes.h (100%)
 rename sysdeps/x86/{nptl => }/bits/semaphore.h (100%)
 rename sysdeps/x86/{nptl => }/elide.h (100%)
 delete mode 100644 sysdeps/x86_64/nptl/Implies


hooks/post-receive
-- 
GNU C Library master sources
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]