PowerPC: Move powerpc64 timer_*.c out of nptl/

diff --git a/ChangeLog b/ChangeLog
index 462abcc..0b7fa9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2014-05-26  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions: Remove,
+       merge into ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions: ... here.
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c: Moved
+       ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c: ... here.
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c: Moved
+       ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c: ... here.
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c:
+       Moved ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c: ...
+       here.
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c:
+       Moved ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c: ... here.
+       * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c:
+       Moved ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c: ... here.
+
        * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Remove
        conditional [RESET_PID].
        * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Likewise.

diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
deleted file mode 100644 (file)
index 3b111dd..0000000
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/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/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
index 16d7128..569e79a 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
@@ -23,3 +23,11 @@ libc {
     __ppc_get_timebase_freq;
   }
 }
+
+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/powerpc/powerpc64/timer_create.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c

diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c

diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c

diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c

diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c