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-405-g3a51fb6


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  3a51fb604715776e051691c65e360bdf7d37488e (commit)
      from  941d7dfd247bc116b89ec97d530d618b5862a80f (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=3a51fb604715776e051691c65e360bdf7d37488e

commit 3a51fb604715776e051691c65e360bdf7d37488e
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed May 14 10:35:39 2014 -0700

    Move x86_64 timer_*.c out of nptl/

diff --git a/ChangeLog b/ChangeLog
index f38e8b7..9b48373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2014-05-14  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/x86_64/Versions: Remove, merge into ...
+	* sysdeps/unix/sysv/linux/x86_64/Versions: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/timer_create.c: here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/timer_delete.c: ... here
+	* nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c: ... here
+	* nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/timer_gettime.c: ... here
+	* nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/timer_settime.c: ... here
+	* nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c:
+	Update #include.
+	* nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c:
+	Likewise.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c:
+	Likewise.
+
 	* sysdeps/unix/sysv/linux/x86_64/clone.S: Deconditionalize the code
 	that was previously under [RESET_PID].
 	* sysdeps/unix/sysv/linux/i386/clone.S: Likewise.
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
index 172223a..d307135 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
@@ -1 +1 @@
-#include "../x86_64/timer_create.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_create.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
index 537516e..2dd94f5 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
@@ -1 +1 @@
-#include "../x86_64/timer_delete.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
index 3f21a73..22eaff5 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
@@ -1 +1 @@
-#include "../x86_64/timer_getoverr.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
index a50143a..cea524b 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
@@ -1 +1 @@
-#include "../x86_64/timer_gettime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
index 37baeff..fa23114 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
@@ -1 +1 @@
-#include "../x86_64/timer_settime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
index 0a9c337..d307135 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c
@@ -1 +1 @@
-#include "../../x86_64/timer_create.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_create.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
index f0d4fd2..2dd94f5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c
@@ -1 +1 @@
-#include "../../x86_64/timer_delete.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
index 82121a7..22eaff5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c
@@ -1 +1 @@
-#include "../../x86_64/timer_getoverr.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
index 313c05f..cea524b 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c
@@ -1 +1 @@
-#include "../../x86_64/timer_gettime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
index 76f549c..fa23114 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c
@@ -1 +1 @@
-#include "../../x86_64/timer_settime.c"
+#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions b/nptl/sysdeps/unix/sysv/linux/x86_64/Versions
deleted file mode 100644
index 3b111dd..0000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions
+++ /dev/null
@@ -1,7 +0,0 @@
-librt {
-  GLIBC_2.3.3 {
-    # Changed timer_t.
-    timer_create; timer_delete; timer_getoverrun; timer_gettime;
-    timer_settime;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/x86_64/Versions b/sysdeps/unix/sysv/linux/x86_64/Versions
index 34c100b..4ce7b78 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Versions
+++ b/sysdeps/unix/sysv/linux/x86_64/Versions
@@ -10,3 +10,11 @@ libc {
     __vdso_clock_gettime;
   }
 }
+
+librt {
+  GLIBC_2.3.3 {
+    # Changed timer_t.
+    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    timer_settime;
+  }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c b/sysdeps/unix/sysv/linux/x86_64/timer_create.c
similarity index 97%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
rename to sysdeps/unix/sysv/linux/x86_64/timer_create.c
index 7624f2c..a1209f9 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_create.c
@@ -22,7 +22,7 @@
 
 
 #define timer_create_alias __timer_create_new
-#include "../timer_create.c"
+#include <sysdeps/unix/sysv/linux/timer_create.c>
 
 #undef timer_create
 versioned_symbol (librt, __timer_create_new, timer_create, GLIBC_2_3_3);
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c b/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
similarity index 96%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
rename to sysdeps/unix/sysv/linux/x86_64/timer_delete.c
index c92da1a..25861b7 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
@@ -21,7 +21,7 @@
 
 
 #define timer_delete_alias __timer_delete_new
-#include "../timer_delete.c"
+#include <sysdeps/unix/sysv/linux/timer_delete.c>
 
 #undef timer_delete
 versioned_symbol (librt, __timer_delete_new, timer_delete, GLIBC_2_3_3);
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c b/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
similarity index 96%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
rename to sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
index 66d927c..7f45000 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
@@ -21,7 +21,7 @@
 
 
 #define timer_getoverrun_alias __timer_getoverrun_new
-#include "../timer_getoverr.c"
+#include <sysdeps/unix/sysv/linux/timer_getoverr.c>
 
 #undef timer_getoverrun
 versioned_symbol (librt, __timer_getoverrun_new, timer_getoverrun,
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c b/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
similarity index 96%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
rename to sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
index 439d553..7df4804 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
@@ -21,7 +21,7 @@
 
 
 #define timer_gettime_alias __timer_gettime_new
-#include "../timer_gettime.c"
+#include <sysdeps/unix/sysv/linux/timer_gettime.c>
 
 #undef timer_gettime
 versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3);
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
similarity index 96%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
rename to sysdeps/unix/sysv/linux/x86_64/timer_settime.c
index f8a8664..399ff83 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
@@ -21,7 +21,7 @@
 
 
 #define timer_settime_alias __timer_settime_new
-#include "../timer_settime.c"
+#include <sysdeps/unix/sysv/linux/timer_settime.c>
 
 #undef timer_settime
 versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);

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

Summary of changes:
 ChangeLog                                          |   33 ++++++++++
 .../sysv/linux/powerpc/powerpc64/timer_create.c    |    2 +-
 .../sysv/linux/powerpc/powerpc64/timer_delete.c    |    2 +-
 .../sysv/linux/powerpc/powerpc64/timer_getoverr.c  |    2 +-
 .../sysv/linux/powerpc/powerpc64/timer_gettime.c   |    2 +-
 .../sysv/linux/powerpc/powerpc64/timer_settime.c   |    2 +-
 .../unix/sysv/linux/sparc/sparc64/timer_create.c   |    2 +-
 .../unix/sysv/linux/sparc/sparc64/timer_delete.c   |    2 +-
 .../unix/sysv/linux/sparc/sparc64/timer_getoverr.c |    2 +-
 .../unix/sysv/linux/sparc/sparc64/timer_gettime.c  |    2 +-
 .../unix/sysv/linux/sparc/sparc64/timer_settime.c  |    2 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/Versions       |    7 --
 nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c |   65 --------------------
 nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c |   44 -------------
 .../unix/sysv/linux/x86_64/timer_getoverr.c        |   38 -----------
 .../sysdeps/unix/sysv/linux/x86_64/timer_gettime.c |   37 -----------
 .../sysdeps/unix/sysv/linux/x86_64/timer_settime.c |   39 ------------
 sysdeps/unix/sysv/linux/x86_64/Versions            |    8 +++
 sysdeps/unix/sysv/linux/x86_64/timer_create.c      |   65 ++++++++++++++++++++
 sysdeps/unix/sysv/linux/x86_64/timer_delete.c      |   44 +++++++++++++
 sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c    |   38 +++++++++++
 sysdeps/unix/sysv/linux/x86_64/timer_gettime.c     |   37 +++++++++++
 sysdeps/unix/sysv/linux/x86_64/timer_settime.c     |   39 ++++++++++++
 23 files changed, 274 insertions(+), 240 deletions(-)
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/Versions
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_create.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_delete.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_settime.c


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]