diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index ffab9f6b4..2e2cd11a4 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -203,7 +203,7 @@ clock_t times(struct tms*) all int nanosleep(const struct timespec*, struct timespec*) all int clock_settime(clockid_t, const struct timespec*) all int clock_getres(clockid_t, struct timespec*) all -int __clock_nanosleep:clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) all +int ___clock_nanosleep:clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) all int getitimer(int, const struct itimerval*) all int setitimer(int, const struct itimerval*, struct itimerval*) all int __timer_create:timer_create(clockid_t clockid, struct sigevent* evp, __kernel_timer_t* timerid) all diff --git a/libc/arch-arm/syscalls/__clock_nanosleep.S b/libc/arch-arm/syscalls/___clock_nanosleep.S similarity index 78% rename from libc/arch-arm/syscalls/__clock_nanosleep.S rename to libc/arch-arm/syscalls/___clock_nanosleep.S index ba7ffc48b..31420bb19 100644 --- a/libc/arch-arm/syscalls/__clock_nanosleep.S +++ b/libc/arch-arm/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) mov ip, r7 ldr r7, =__NR_clock_nanosleep swi #0 @@ -11,4 +11,5 @@ ENTRY(__clock_nanosleep) bxls lr neg r0, r0 b __set_errno_internal -END(__clock_nanosleep) +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/arch-arm64/syscalls/__clock_nanosleep.S b/libc/arch-arm64/syscalls/___clock_nanosleep.S similarity index 75% rename from libc/arch-arm64/syscalls/__clock_nanosleep.S rename to libc/arch-arm64/syscalls/___clock_nanosleep.S index 1df15d631..0dcfd4f4f 100644 --- a/libc/arch-arm64/syscalls/__clock_nanosleep.S +++ b/libc/arch-arm64/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) mov x8, __NR_clock_nanosleep svc #0 @@ -11,5 +11,5 @@ ENTRY(__clock_nanosleep) b.hi __set_errno_internal ret -END(__clock_nanosleep) -.hidden __clock_nanosleep +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/arch-mips/syscalls/__clock_nanosleep.S b/libc/arch-mips/syscalls/___clock_nanosleep.S similarity index 78% rename from libc/arch-mips/syscalls/__clock_nanosleep.S rename to libc/arch-mips/syscalls/___clock_nanosleep.S index 97bfa27f0..4879489a4 100644 --- a/libc/arch-mips/syscalls/__clock_nanosleep.S +++ b/libc/arch-mips/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) .set noreorder .cpload t9 li v0, __NR_clock_nanosleep @@ -16,4 +16,5 @@ ENTRY(__clock_nanosleep) j t9 nop .set reorder -END(__clock_nanosleep) +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/arch-mips64/syscalls/__clock_nanosleep.S b/libc/arch-mips64/syscalls/___clock_nanosleep.S similarity index 82% rename from libc/arch-mips64/syscalls/__clock_nanosleep.S rename to libc/arch-mips64/syscalls/___clock_nanosleep.S index 204675f06..e9fb3164c 100644 --- a/libc/arch-mips64/syscalls/__clock_nanosleep.S +++ b/libc/arch-mips64/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) .set push .set noreorder li v0, __NR_clock_nanosleep @@ -22,5 +22,5 @@ ENTRY(__clock_nanosleep) j t9 move ra, t0 .set pop -END(__clock_nanosleep) -.hidden __clock_nanosleep +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/arch-x86/syscalls/__clock_nanosleep.S b/libc/arch-x86/syscalls/___clock_nanosleep.S similarity index 90% rename from libc/arch-x86/syscalls/__clock_nanosleep.S rename to libc/arch-x86/syscalls/___clock_nanosleep.S index 75a54d183..088a92eff 100644 --- a/libc/arch-x86/syscalls/__clock_nanosleep.S +++ b/libc/arch-x86/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) pushl %ebx .cfi_def_cfa_offset 8 .cfi_rel_offset ebx, 0 @@ -33,4 +33,5 @@ ENTRY(__clock_nanosleep) popl %ecx popl %ebx ret -END(__clock_nanosleep) +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/arch-x86_64/syscalls/__clock_nanosleep.S b/libc/arch-x86_64/syscalls/___clock_nanosleep.S similarity index 78% rename from libc/arch-x86_64/syscalls/__clock_nanosleep.S rename to libc/arch-x86_64/syscalls/___clock_nanosleep.S index 37726c0b3..3286eb274 100644 --- a/libc/arch-x86_64/syscalls/__clock_nanosleep.S +++ b/libc/arch-x86_64/syscalls/___clock_nanosleep.S @@ -2,7 +2,7 @@ #include -ENTRY(__clock_nanosleep) +ENTRY(___clock_nanosleep) movq %rcx, %r10 movl $__NR_clock_nanosleep, %eax syscall @@ -13,5 +13,5 @@ ENTRY(__clock_nanosleep) call __set_errno_internal 1: ret -END(__clock_nanosleep) -.hidden __clock_nanosleep +END(___clock_nanosleep) +.hidden ___clock_nanosleep diff --git a/libc/bionic/clock_nanosleep.cpp b/libc/bionic/clock_nanosleep.cpp index 15b8fe744..8e2146f46 100644 --- a/libc/bionic/clock_nanosleep.cpp +++ b/libc/bionic/clock_nanosleep.cpp @@ -30,9 +30,9 @@ #include "private/ErrnoRestorer.h" -extern "C" int __clock_nanosleep(clockid_t, int, const timespec*, timespec*); +extern "C" int ___clock_nanosleep(clockid_t, int, const timespec*, timespec*); int clock_nanosleep(clockid_t clock_id, int flags, const timespec* in, timespec* out) { ErrnoRestorer errno_restorer; - return (__clock_nanosleep(clock_id, flags, in, out) == 0) ? 0 : errno; + return (___clock_nanosleep(clock_id, flags, in, out) == 0) ? 0 : errno; }