From 3a51fb604715776e051691c65e360bdf7d37488e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 14 May 2014 10:35:39 -0700 Subject: [PATCH] Move x86_64 timer_*.c out of nptl/ --- ChangeLog | 33 ++++++++++++++++++++++ .../sysv/linux/powerpc/powerpc64/timer_create.c | 2 +- .../sysv/linux/powerpc/powerpc64/timer_delete.c | 2 +- .../sysv/linux/powerpc/powerpc64/timer_getoverr.c | 2 +- .../sysv/linux/powerpc/powerpc64/timer_gettime.c | 2 +- .../sysv/linux/powerpc/powerpc64/timer_settime.c | 2 +- .../unix/sysv/linux/sparc/sparc64/timer_create.c | 2 +- .../unix/sysv/linux/sparc/sparc64/timer_delete.c | 2 +- .../unix/sysv/linux/sparc/sparc64/timer_getoverr.c | 2 +- .../unix/sysv/linux/sparc/sparc64/timer_gettime.c | 2 +- .../unix/sysv/linux/sparc/sparc64/timer_settime.c | 2 +- nptl/sysdeps/unix/sysv/linux/x86_64/Versions | 7 ----- sysdeps/unix/sysv/linux/x86_64/Versions | 8 ++++++ .../unix/sysv/linux/x86_64/timer_create.c | 2 +- .../unix/sysv/linux/x86_64/timer_delete.c | 2 +- .../unix/sysv/linux/x86_64/timer_getoverr.c | 2 +- .../unix/sysv/linux/x86_64/timer_gettime.c | 2 +- .../unix/sysv/linux/x86_64/timer_settime.c | 2 +- 18 files changed, 56 insertions(+), 22 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/Versions rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/x86_64/timer_create.c (97%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/x86_64/timer_delete.c (96%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/x86_64/timer_getoverr.c (96%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/x86_64/timer_gettime.c (96%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/x86_64/timer_settime.c (96%) diff --git a/ChangeLog b/ChangeLog index f38e8b7509..9b48373286 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,38 @@ 2014-05-14 Roland McGrath + * 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 172223af3f..d307135003 100644 --- 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 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 537516e0aa..2dd94f5c7a 100644 --- 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 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 3f21a73c98..22eaff5cda 100644 --- 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 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 a50143adc5..cea524bae5 100644 --- 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 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 37baeffacc..fa231149d5 100644 --- 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 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 0a9c3372b8..d307135003 100644 --- 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 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 f0d4fd21d6..2dd94f5c7a 100644 --- 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 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 82121a7a28..22eaff5cda 100644 --- 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 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 313c05feac..cea524bae5 100644 --- 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 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 76f549cb47..fa231149d5 100644 --- 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 diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions b/nptl/sysdeps/unix/sysv/linux/x86_64/Versions deleted file mode 100644 index 3b111ddb51..0000000000 --- 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 34c100bfd2..4ce7b78af4 100644 --- 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 7624f2cdb2..a1209f9f0b 100644 --- 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 #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 c92da1af35..25861b7e9e 100644 --- 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 #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 66d927c56a..7f45000080 100644 --- 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 #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 439d553d71..7df4804fdf 100644 --- 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 #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 f8a8664840..399ff835b0 100644 --- 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 #undef timer_settime versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3); -- 2.11.4.GIT