From 50a40819543199954a0864c22f308f367cdbd2c2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 23 May 2014 07:43:37 -0500 Subject: PowerPC: Move powerpc64 timer_*.c out of nptl/ --- ChangeLog | 20 ++++++++++++++++++++ .../unix/sysv/linux/powerpc/powerpc64/Versions | 7 ------- .../unix/sysv/linux/powerpc/powerpc64/timer_create.c | 1 - .../unix/sysv/linux/powerpc/powerpc64/timer_delete.c | 1 - .../sysv/linux/powerpc/powerpc64/timer_getoverr.c | 1 - .../sysv/linux/powerpc/powerpc64/timer_gettime.c | 1 - .../sysv/linux/powerpc/powerpc64/timer_settime.c | 1 - sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions | 8 ++++++++ .../unix/sysv/linux/powerpc/powerpc64/timer_create.c | 1 + .../unix/sysv/linux/powerpc/powerpc64/timer_delete.c | 1 + .../sysv/linux/powerpc/powerpc64/timer_getoverr.c | 1 + .../sysv/linux/powerpc/powerpc64/timer_gettime.c | 1 + .../sysv/linux/powerpc/powerpc64/timer_settime.c | 1 + 13 files changed, 33 insertions(+), 12 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c diff --git a/ChangeLog b/ChangeLog index 462abcc329..0b7fa9f2d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2014-05-26 Adhemerval Zanella + * 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 index 3b111ddb51..0000000000 --- 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/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c deleted file mode 100644 index d307135003..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c deleted file mode 100644 index 2dd94f5c7a..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c deleted file mode 100644 index cea524bae5..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c deleted file mode 100644 index fa231149d5..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions index 16d7128057..569e79a5de 100644 --- 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/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c new file mode 100644 index 0000000000..d307135003 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c new file mode 100644 index 0000000000..2dd94f5c7a --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c new file mode 100644 index 0000000000..22eaff5cda --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c new file mode 100644 index 0000000000..cea524bae5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c new file mode 100644 index 0000000000..fa231149d5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c @@ -0,0 +1 @@ +#include -- cgit 1.4.1