Move x86_64 timer_*.c out of nptl/

diff --git a/ChangeLog b/ChangeLog
index f38e8b7509c959e7ae78f0c284585343c0fd178e..9b483732864746645788a9a6be46066517e661fb 100644 (file)
--- 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 172223af3fb5f6632855716337202f77f7dca1a8..d307135003beaa045ce8047734d3098499a9acbb 100644 (file)
--- 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 537516e0aa423bd0993a86bada6c155156eedc65..2dd94f5c7a01c4e65c74dfcc7b53405044722afe 100644 (file)
--- 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 3f21a73c98610714fdac0c724a89465182337233..22eaff5cdaa61e761a94c4f4945bcf1fa494104b 100644 (file)
--- 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 a50143adc5164e853314b6663884e6c3255d2cc1..cea524bae51f1e09290fdd8cb900f1998ac983b2 100644 (file)
--- 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 37baeffacce8f80b0198cd87eb02dcaf5f63a714..fa231149d599615c6a7ac2f975e6854524a31b5b 100644 (file)
--- 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 0a9c3372b843d21bef8bc81b5e3024fee72f4e4f..d307135003beaa045ce8047734d3098499a9acbb 100644 (file)
--- 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 f0d4fd21d621389a6be8ec88ff3e26eab7200183..2dd94f5c7a01c4e65c74dfcc7b53405044722afe 100644 (file)
--- 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 82121a7a2816e01fb37d3d428853bd5da02e9842..22eaff5cdaa61e761a94c4f4945bcf1fa494104b 100644 (file)
--- 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 313c05feac470671298645112513ebd23294129d..cea524bae51f1e09290fdd8cb900f1998ac983b2 100644 (file)
--- 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 76f549cb47488e07e3f68a9a8dffad0c16926bd9..fa231149d599615c6a7ac2f975e6854524a31b5b 100644 (file)
--- 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 (file)
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 34c100bfd29f883b931a735782bdc9624592614f..4ce7b78af4a0e5e506ecc9fe9b468d4f24007ff8 100644 (file)
--- 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 7624f2cdb2fd39ca666390d16ed809204021cd9e..a1209f9f0bd8c0f73e7bb3e8969e59186f29d4e0 100644 (file)
--- 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 c92da1af35e74e1019d112040c3a64e5e5d8f793..25861b7e9ecefaca2837c8ec212f9f9a073020e8 100644 (file)
--- 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 66d927c56aa06a941b2cb924debfb71482b35a5c..7f4500008068cd5afdf98bdb55ef2e7c0f283611 100644 (file)
--- 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 439d553d71b083de11bfcb99e687e21a45ccf178..7df4804fdf7ef788725171f1df2f5985e131de22 100644 (file)
--- 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 f8a866484091be52378e9f45ea0dadef848099c8..399ff835b023710eedfabf831ea3df19ebcc6485 100644 (file)
--- 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);