[COMMITTED] Move x86_64 timer_*.c out of nptl/
diff mbox

Message ID 20140514174214.BCFD12C3A4D@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath May 14, 2014, 5:42 p.m. UTC
Verified on x86_64-linux-gnu that no librt.so code changes.  I didn't
verify the sparc or powerpc builds that are affected by this.  If I
somehow managed to break them it should be just trivial typo fixes.


Thanks,
Roland


	* 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.

Patch
diff mbox

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
-  }
-}
--- 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;
+  }
+}
--- 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);
--- 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);
--- 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,
--- 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);
--- 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);