From 9b58006f8e68aa9dabe9cee1034a93f7cd8c7a68 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 12 May 2019 22:45:45 +0000 Subject: [PATCH] Implement and use new parsers of clock_nanosleep syscall * time.c (SYS_FUNC(clock_nanosleep)): Remove. [HAVE_ARCH_TIME32_SYSCALLS] (SYS_FUNC(clock_nanosleep_time32)): New function. * linux/64/syscallent.h: Replace SEN(clock_nanosleep) with SEN(clock_nanosleep_time64). * linux/alpha/syscallent.h: Likewise. * linux/ia64/syscallent.h: Likewise. * linux/mips/syscallent-n64.h: Likewise. * linux/powerpc64/syscallent.h: Likewise. * linux/s390x/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/sparc64/syscallent.h: Likewise. * linux/x32/syscallent.h: Likewise. * linux/x86_64/syscallent.h: Likewise. * linux/32/syscallent.h: Replace SEN(clock_nanosleep) with SEN(clock_nanosleep_time32). * linux/arm/syscallent.h: Likewise. * linux/avr32/syscallent.h: Likewise. * linux/bfin/syscallent.h: Likewise. * linux/hppa/syscallent.h: Likewise. * linux/i386/syscallent.h: Likewise. * linux/m68k/syscallent.h: Likewise. * linux/microblaze/syscallent.h: Likewise. * linux/mips/syscallent-n32.h: Likewise. * linux/mips/syscallent-o32.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/s390/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/xtensa/syscallent.h: Likewise. --- linux/32/syscallent.h | 2 +- linux/64/syscallent.h | 2 +- linux/alpha/syscallent.h | 2 +- linux/arm/syscallent.h | 2 +- linux/avr32/syscallent.h | 2 +- linux/bfin/syscallent.h | 2 +- linux/hppa/syscallent.h | 2 +- linux/i386/syscallent.h | 2 +- linux/ia64/syscallent.h | 2 +- linux/m68k/syscallent.h | 2 +- linux/microblaze/syscallent.h | 2 +- linux/mips/syscallent-n32.h | 2 +- linux/mips/syscallent-n64.h | 2 +- linux/mips/syscallent-o32.h | 2 +- linux/powerpc/syscallent.h | 2 +- linux/powerpc64/syscallent.h | 2 +- linux/s390/syscallent.h | 2 +- linux/s390x/syscallent.h | 2 +- linux/sh/syscallent.h | 2 +- linux/sh64/syscallent.h | 2 +- linux/sparc/syscallent.h | 2 +- linux/sparc64/syscallent.h | 2 +- linux/x32/syscallent.h | 2 +- linux/x86_64/syscallent.h | 2 +- linux/xtensa/syscallent.h | 2 +- time.c | 6 ++++-- 26 files changed, 29 insertions(+), 27 deletions(-) diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h index 95e28a36..7f0e9c9b 100644 --- a/linux/32/syscallent.h +++ b/linux/32/syscallent.h @@ -127,7 +127,7 @@ [112] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [113] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [114] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[115] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[115] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [116] = { 3, 0, SEN(syslog), "syslog" }, [117] = { 4, 0, SEN(ptrace), "ptrace" }, [118] = { 2, 0, SEN(sched_setparam), "sched_setparam" }, diff --git a/linux/64/syscallent.h b/linux/64/syscallent.h index 850a1dd1..bc8b29fc 100644 --- a/linux/64/syscallent.h +++ b/linux/64/syscallent.h @@ -120,7 +120,7 @@ [112] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [113] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [114] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[115] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[115] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [116] = { 3, 0, SEN(syslog), "syslog" }, [117] = { 4, 0, SEN(ptrace), "ptrace" }, [118] = { 2, 0, SEN(sched_setparam), "sched_setparam" }, diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h index ae3d23a6..6af9240c 100644 --- a/linux/alpha/syscallent.h +++ b/linux/alpha/syscallent.h @@ -365,7 +365,7 @@ [419] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [420] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [421] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[422] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[422] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [423] = { 4, TI, SEN(semtimedop_time64), "semtimedop" }, [424] = { 3, TS, SEN(tgkill), "tgkill" }, [425] = { 2, TF|TST|TSTA, SEN(stat64), "stat64" }, diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 644369f2..50b19c61 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -272,7 +272,7 @@ [262] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [263] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [264] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[265] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[265] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [266] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [267] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [268] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h index 658c8a2f..1c38aa89 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -224,7 +224,7 @@ [215] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [216] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [217] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[218] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[218] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [219] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [220] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [221] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 6f0b954b..feea293d 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -274,7 +274,7 @@ [265] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [266] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [267] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[268] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[268] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [269] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [270] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [271] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index 9c245511..78efa407 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -261,7 +261,7 @@ [255] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [256] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [257] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[258] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[258] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [259] = { 3, TS, SEN(tgkill), "tgkill" }, [260] = { 6, TM, SEN(mbind), "mbind" }, [261] = { 5, TM, SEN(get_mempolicy), "get_mempolicy" }, diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 9bcb55b3..ccea1c1a 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -273,7 +273,7 @@ [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [265] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [266] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[267] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[267] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [268] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [269] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [270] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index cdc72850..5bae4981 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -239,7 +239,7 @@ [1024 + 229] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [1024 + 230] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [1024 + 231] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[1024 + 232] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[1024 + 232] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [1024 + 233] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [1024 + 234] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [1024 + 235] = { 6, TM, SEN(mbind), "mbind" }, diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index 428ed6ef..41339f24 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -268,7 +268,7 @@ [259] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [260] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [261] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[262] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[262] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [263] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [264] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [265] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index b616845a..b2f6d533 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -273,7 +273,7 @@ [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [265] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [266] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[267] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[267] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [268] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [269] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [270] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h index 06001adf..2516b655 100644 --- a/linux/mips/syscallent-n32.h +++ b/linux/mips/syscallent-n32.h @@ -235,7 +235,7 @@ [6225] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [6226] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [6227] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[6228] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[6228] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [6229] = { 3, TS, SEN(tgkill), "tgkill" }, [6230] = { 2, TF, SEN(utimes), "utimes" }, [6231] = { 6, TM, SEN(mbind), "mbind" }, diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h index 4c2ff19a..6bdfbf89 100644 --- a/linux/mips/syscallent-n64.h +++ b/linux/mips/syscallent-n64.h @@ -231,7 +231,7 @@ [5221] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [5222] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [5223] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[5224] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[5224] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [5225] = { 3, TS, SEN(tgkill), "tgkill" }, [5226] = { 2, TF, SEN(utimes), "utimes" }, [5227] = { 6, TM, SEN(mbind), "mbind" }, diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h index 92023dd8..a29649ae 100644 --- a/linux/mips/syscallent-o32.h +++ b/linux/mips/syscallent-o32.h @@ -273,7 +273,7 @@ [4262] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [4263] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [4264] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[4265] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[4265] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [4266] = { 3, TS, SEN(tgkill), "tgkill" }, [4267] = { 2, TF, SEN(utimes), "utimes" }, [4268] = { 6, TM, SEN(mbind), "mbind" }, diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 8d001062..627117c6 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -255,7 +255,7 @@ [245] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [246] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [247] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[248] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[248] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [249] = { 2, 0, SEN(printargs), "swapcontext" }, [250] = { 3, TS, SEN(tgkill), "tgkill" }, [251] = { 2, TF, SEN(utimes), "utimes" }, diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h index cc5b15a3..12e2368a 100644 --- a/linux/powerpc64/syscallent.h +++ b/linux/powerpc64/syscallent.h @@ -250,7 +250,7 @@ [245] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [246] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [247] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[248] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[248] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [249] = { 2, 0, SEN(printargs), "swapcontext" }, [250] = { 3, TS, SEN(tgkill), "tgkill" }, [251] = { 2, TF, SEN(utimes), "utimes" }, diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index 2b171e63..2168bcdc 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -271,7 +271,7 @@ [259] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [260] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [261] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[262] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[262] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [263] = { 5, 0, SEN(vserver), "vserver" }, [264] = { 6, TD, SEN(fadvise64_64), "fadvise64_64" }, [265] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 3848e5c3..37f4e23d 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -255,7 +255,7 @@ [259] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [260] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [261] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[262] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[262] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [263] = { 5, 0, SEN(vserver), "vserver" }, [264] = { }, [265] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index 8e8ea671..b039fb7a 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -273,7 +273,7 @@ [264] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [265] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [266] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[267] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[267] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [268] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [269] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [270] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 3c88eee5..ab9e61e9 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -299,7 +299,7 @@ [292] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [293] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [294] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[295] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[295] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [296] = { 3, TF|TSF|TSFA, SEN(statfs64), "statfs64" }, [297] = { 3, TD|TFSF|TSFA, SEN(fstatfs64), "fstatfs64" }, [298] = { 3, TS, SEN(tgkill), "tgkill" }, diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index e61d4aef..7baf6ff8 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -264,7 +264,7 @@ [256] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [257] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [258] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[259] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[259] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [260] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, [261] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, [262] = { 4, 0, SEN(timer_settime), "timer_settime" }, diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h index c723c550..917b0ceb 100644 --- a/linux/sparc64/syscallent.h +++ b/linux/sparc64/syscallent.h @@ -262,7 +262,7 @@ [256] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [257] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [258] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[259] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[259] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [260] = { 3, 0, SEN(sched_getaffinity), "sched_getaffinity" }, [261] = { 3, 0, SEN(sched_setaffinity), "sched_setaffinity" }, [262] = { 4, 0, SEN(timer_settime), "timer_settime" }, diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h index 7f9172d6..63f10671 100644 --- a/linux/x32/syscallent.h +++ b/linux/x32/syscallent.h @@ -235,7 +235,7 @@ [227] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [228] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [229] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[230] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[230] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [231] = { 1, TP|SE, SEN(exit), "exit_group" }, [232] = { 4, TD, SEN(epoll_wait), "epoll_wait" }, [233] = { 4, TD, SEN(epoll_ctl), "epoll_ctl" }, diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index fc759fb7..3d33bb57 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -235,7 +235,7 @@ [227] = { 2, 0, SEN(clock_settime64), "clock_settime" }, [228] = { 2, 0, SEN(clock_gettime64), "clock_gettime" }, [229] = { 2, 0, SEN(clock_getres_time64), "clock_getres" }, -[230] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[230] = { 4, 0, SEN(clock_nanosleep_time64), "clock_nanosleep" }, [231] = { 1, TP|SE, SEN(exit), "exit_group" }, [232] = { 4, TD, SEN(epoll_wait), "epoll_wait" }, [233] = { 4, TD, SEN(epoll_ctl), "epoll_ctl" }, diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h index 6cf51237..8af81934 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -244,7 +244,7 @@ [244] = { 2, 0, SEN(clock_settime32), "clock_settime" }, [245] = { 2, 0, SEN(clock_gettime32), "clock_gettime" }, [246] = { 2, 0, SEN(clock_getres_time32), "clock_getres" }, -[247] = { 4, 0, SEN(clock_nanosleep), "clock_nanosleep" }, +[247] = { 4, 0, SEN(clock_nanosleep_time32), "clock_nanosleep" }, [248] = { 3, 0, SEN(timer_create), "timer_create" }, [249] = { 1, 0, SEN(timer_delete), "timer_delete" }, [250] = { 4, 0, SEN(timer_settime), "timer_settime" }, diff --git a/time.c b/time.c index 364fca4d..fba56e36 100644 --- a/time.c +++ b/time.c @@ -296,10 +296,12 @@ do_clock_nanosleep(struct tcb *const tcp, const print_obj_by_addr_fn print_ts) return 0; } -SYS_FUNC(clock_nanosleep) +#if HAVE_ARCH_TIME32_SYSCALLS +SYS_FUNC(clock_nanosleep_time32) { - return do_clock_nanosleep(tcp, print_timespec); + return do_clock_nanosleep(tcp, print_timespec32); } +#endif SYS_FUNC(clock_nanosleep_time64) { -- 2.40.0