From: Roland McGrath Date: Wed, 14 May 2014 17:57:40 +0000 (-0700) Subject: Update s390 timer_*.c files for x86_64 file moves. X-Git-Tag: glibc-2.20~503 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ef6befaf5e768863d2f70c7b15a283d819c7c99;p=thirdparty%2Fglibc.git Update s390 timer_*.c files for x86_64 file moves. --- diff --git a/ChangeLog b/ChangeLog index 02c09a28d33..aa264abe006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,11 @@ Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Likewise. + * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/clone.S: Deconditionalize the code that was previously under [RESET_PID]. diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c index 172223af3fb..d307135003b 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c @@ -1 +1 @@ -#include "../x86_64/timer_create.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c index 537516e0aa4..2dd94f5c7a0 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c @@ -1 +1 @@ -#include "../x86_64/timer_delete.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c index 3f21a73c986..22eaff5cdaa 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c @@ -1 +1 @@ -#include "../x86_64/timer_getoverr.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c index a50143adc51..cea524bae51 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c @@ -1 +1 @@ -#include "../x86_64/timer_gettime.c" +#include diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c index 37baeffacce..fa231149d59 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c @@ -1 +1 @@ -#include "../x86_64/timer_settime.c" +#include