diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-05-23 07:43:37 -0500 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-05-26 11:41:46 -0500 |
| commit | 50a40819543199954a0864c22f308f367cdbd2c2 (patch) | |
| tree | e7a5af43296edf94621f602410b3b3470c1a51b9 | |
| parent | 8464c2a11033bf52c04043ec65166d99f115b16e (diff) | |
| download | glibc-50a40819543199954a0864c22f308f367cdbd2c2.tar.gz glibc-50a40819543199954a0864c22f308f367cdbd2c2.tar.xz glibc-50a40819543199954a0864c22f308f367cdbd2c2.zip | |
PowerPC: Move powerpc64 timer_*.c out of nptl/
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c (renamed from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c (renamed from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c (renamed from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c (renamed from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c (renamed from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c) | 0 |
8 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 462abcc329..0b7fa9f2d1 100644 --- 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 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/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/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c index d307135003..d307135003 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c +++ b/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 index 2dd94f5c7a..2dd94f5c7a 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c +++ b/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 index 22eaff5cda..22eaff5cda 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c +++ b/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 index cea524bae5..cea524bae5 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c +++ b/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 index fa231149d5..fa231149d5 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c |