From 2cae9f59da6106b4545da85b33d1e206a1e4c1e7 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 5 Feb 2020 09:51:09 -0500 Subject: remove further legacy time32 clock syscalls from public syscall.h this extends commit 5a105f19b5aae79dd302899e634b6b18b3dcd0d6, removing clock_settime, clock_getres, clock_nanosleep, and settimeofday. --- arch/arm/bits/syscall.h.in | 8 ++++---- arch/i386/bits/syscall.h.in | 8 ++++---- arch/m68k/bits/syscall.h.in | 8 ++++---- arch/microblaze/bits/syscall.h.in | 8 ++++---- arch/mips/bits/syscall.h.in | 8 ++++---- arch/mipsn32/bits/syscall.h.in | 8 ++++---- arch/or1k/bits/syscall.h.in | 8 ++++---- arch/powerpc/bits/syscall.h.in | 8 ++++---- arch/sh/bits/syscall.h.in | 8 ++++---- src/internal/syscall.h | 16 ++++++++++++++++ 10 files changed, 52 insertions(+), 36 deletions(-) diff --git a/arch/arm/bits/syscall.h.in b/arch/arm/bits/syscall.h.in index 4d844e57..82757a96 100644 --- a/arch/arm/bits/syscall.h.in +++ b/arch/arm/bits/syscall.h.in @@ -56,7 +56,7 @@ #define __NR_setrlimit 75 #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_symlink 83 @@ -215,10 +215,10 @@ #define __NR_timer_gettime 259 #define __NR_timer_getoverrun 260 #define __NR_timer_delete 261 -#define __NR_clock_settime 262 +#define __NR_clock_settime32 262 #define __NR_clock_gettime32 263 -#define __NR_clock_getres 264 -#define __NR_clock_nanosleep 265 +#define __NR_clock_getres_time32 264 +#define __NR_clock_nanosleep_time32 265 #define __NR_statfs64 266 #define __NR_fstatfs64 267 #define __NR_tgkill 268 diff --git a/arch/i386/bits/syscall.h.in b/arch/i386/bits/syscall.h.in index a96317c0..a04d69dc 100644 --- a/arch/i386/bits/syscall.h.in +++ b/arch/i386/bits/syscall.h.in @@ -77,7 +77,7 @@ #define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */ #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_select 82 @@ -261,10 +261,10 @@ #define __NR_timer_gettime (__NR_timer_create+2) #define __NR_timer_getoverrun (__NR_timer_create+3) #define __NR_timer_delete (__NR_timer_create+4) -#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_settime32 (__NR_timer_create+5) #define __NR_clock_gettime32 (__NR_timer_create+6) -#define __NR_clock_getres (__NR_timer_create+7) -#define __NR_clock_nanosleep (__NR_timer_create+8) +#define __NR_clock_getres_time32 (__NR_timer_create+7) +#define __NR_clock_nanosleep_time32 (__NR_timer_create+8) #define __NR_statfs64 268 #define __NR_fstatfs64 269 #define __NR_tgkill 270 diff --git a/arch/m68k/bits/syscall.h.in b/arch/m68k/bits/syscall.h.in index e70d3472..5aa5695d 100644 --- a/arch/m68k/bits/syscall.h.in +++ b/arch/m68k/bits/syscall.h.in @@ -68,7 +68,7 @@ #define __NR_getrlimit 76 #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_select 82 @@ -239,10 +239,10 @@ #define __NR_timer_gettime 256 #define __NR_timer_getoverrun 257 #define __NR_timer_delete 258 -#define __NR_clock_settime 259 +#define __NR_clock_settime32 259 #define __NR_clock_gettime32 260 -#define __NR_clock_getres 261 -#define __NR_clock_nanosleep 262 +#define __NR_clock_getres_time32 261 +#define __NR_clock_nanosleep_time32 262 #define __NR_statfs64 263 #define __NR_fstatfs64 264 #define __NR_tgkill 265 diff --git a/arch/microblaze/bits/syscall.h.in b/arch/microblaze/bits/syscall.h.in index b23fe6ef..7476ba2f 100644 --- a/arch/microblaze/bits/syscall.h.in +++ b/arch/microblaze/bits/syscall.h.in @@ -77,7 +77,7 @@ #define __NR_getrlimit 76 #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_select 82 @@ -259,10 +259,10 @@ #define __NR_timer_gettime 261 #define __NR_timer_getoverrun 262 #define __NR_timer_delete 263 -#define __NR_clock_settime 264 +#define __NR_clock_settime32 264 #define __NR_clock_gettime32 265 -#define __NR_clock_getres 266 -#define __NR_clock_nanosleep 267 +#define __NR_clock_getres_time32 266 +#define __NR_clock_nanosleep_time32 267 #define __NR_statfs64 268 #define __NR_fstatfs64 269 #define __NR_tgkill 270 diff --git a/arch/mips/bits/syscall.h.in b/arch/mips/bits/syscall.h.in index e3f2de31..33532fcd 100644 --- a/arch/mips/bits/syscall.h.in +++ b/arch/mips/bits/syscall.h.in @@ -77,7 +77,7 @@ #define __NR_getrlimit 4076 #define __NR_getrusage 4077 #define __NR_gettimeofday_time32 4078 -#define __NR_settimeofday 4079 +#define __NR_settimeofday_time32 4079 #define __NR_getgroups 4080 #define __NR_setgroups 4081 #define __NR_reserved82 4082 @@ -260,10 +260,10 @@ #define __NR_timer_gettime 4259 #define __NR_timer_getoverrun 4260 #define __NR_timer_delete 4261 -#define __NR_clock_settime 4262 +#define __NR_clock_settime32 4262 #define __NR_clock_gettime32 4263 -#define __NR_clock_getres 4264 -#define __NR_clock_nanosleep 4265 +#define __NR_clock_getres_time32 4264 +#define __NR_clock_nanosleep_time32 4265 #define __NR_tgkill 4266 #define __NR_utimes 4267 #define __NR_mbind 4268 diff --git a/arch/mipsn32/bits/syscall.h.in b/arch/mipsn32/bits/syscall.h.in index d13fda12..456419ce 100644 --- a/arch/mipsn32/bits/syscall.h.in +++ b/arch/mipsn32/bits/syscall.h.in @@ -157,7 +157,7 @@ #define __NR_chroot 6156 #define __NR_sync 6157 #define __NR_acct 6158 -#define __NR_settimeofday 6159 +#define __NR_settimeofday_time32 6159 #define __NR_mount 6160 #define __NR_umount2 6161 #define __NR_swapon 6162 @@ -223,10 +223,10 @@ #define __NR_timer_gettime 6222 #define __NR_timer_getoverrun 6223 #define __NR_timer_delete 6224 -#define __NR_clock_settime 6225 +#define __NR_clock_settime32 6225 #define __NR_clock_gettime32 6226 -#define __NR_clock_getres 6227 -#define __NR_clock_nanosleep 6228 +#define __NR_clock_getres_time32 6227 +#define __NR_clock_nanosleep_time32 6228 #define __NR_tgkill 6229 #define __NR_utimes 6230 #define __NR_mbind 6231 diff --git a/arch/or1k/bits/syscall.h.in b/arch/or1k/bits/syscall.h.in index 82d94b29..bb03cb94 100644 --- a/arch/or1k/bits/syscall.h.in +++ b/arch/or1k/bits/syscall.h.in @@ -111,10 +111,10 @@ #define __NR_timer_getoverrun 109 #define __NR_timer_settime 110 #define __NR_timer_delete 111 -#define __NR_clock_settime 112 +#define __NR_clock_settime32 112 #define __NR_clock_gettime32 113 -#define __NR_clock_getres 114 -#define __NR_clock_nanosleep 115 +#define __NR_clock_getres_time32 114 +#define __NR_clock_nanosleep_time32 115 #define __NR_syslog 116 #define __NR_ptrace 117 #define __NR_sched_setparam 118 @@ -169,7 +169,7 @@ #define __NR_prctl 167 #define __NR_getcpu 168 #define __NR_gettimeofday_time32 169 -#define __NR_settimeofday 170 +#define __NR_settimeofday_time32 170 #define __NR_adjtimex 171 #define __NR_getpid 172 #define __NR_getppid 173 diff --git a/arch/powerpc/bits/syscall.h.in b/arch/powerpc/bits/syscall.h.in index 14cf79c6..30002fdb 100644 --- a/arch/powerpc/bits/syscall.h.in +++ b/arch/powerpc/bits/syscall.h.in @@ -77,7 +77,7 @@ #define __NR_getrlimit 76 #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_select 82 @@ -242,10 +242,10 @@ #define __NR_timer_gettime 242 #define __NR_timer_getoverrun 243 #define __NR_timer_delete 244 -#define __NR_clock_settime 245 +#define __NR_clock_settime32 245 #define __NR_clock_gettime32 246 -#define __NR_clock_getres 247 -#define __NR_clock_nanosleep 248 +#define __NR_clock_getres_time32 247 +#define __NR_clock_nanosleep_time32 248 #define __NR_swapcontext 249 #define __NR_tgkill 250 #define __NR_utimes 251 diff --git a/arch/sh/bits/syscall.h.in b/arch/sh/bits/syscall.h.in index 5c24f4a6..6f72d944 100644 --- a/arch/sh/bits/syscall.h.in +++ b/arch/sh/bits/syscall.h.in @@ -68,7 +68,7 @@ #define __NR_getrlimit 76 #define __NR_getrusage 77 #define __NR_gettimeofday_time32 78 -#define __NR_settimeofday 79 +#define __NR_settimeofday_time32 79 #define __NR_getgroups 80 #define __NR_setgroups 81 #define __NR_symlink 83 @@ -235,10 +235,10 @@ #define __NR_timer_gettime 261 #define __NR_timer_getoverrun 262 #define __NR_timer_delete 263 -#define __NR_clock_settime 264 +#define __NR_clock_settime32 264 #define __NR_clock_gettime32 265 -#define __NR_clock_getres 266 -#define __NR_clock_nanosleep 267 +#define __NR_clock_getres_time32 266 +#define __NR_clock_nanosleep_time32 267 #define __NR_statfs64 268 #define __NR_fstatfs64 269 #define __NR_tgkill 270 diff --git a/src/internal/syscall.h b/src/internal/syscall.h index 0b61f34e..adf602ae 100644 --- a/src/internal/syscall.h +++ b/src/internal/syscall.h @@ -193,14 +193,30 @@ hidden long __syscall_ret(unsigned long), #define SYS_sendfile SYS_sendfile64 #endif +#ifndef SYS_clock_settime +#define SYS_clock_settime SYS_clock_settime32 +#endif + #ifndef SYS_clock_gettime #define SYS_clock_gettime SYS_clock_gettime32 #endif +#ifndef SYS_clock_getres +#define SYS_clock_getres SYS_clock_getres_time32 +#endif + +#ifndef SYS_clock_nanosleep +#define SYS_clock_nanosleep SYS_clock_nanosleep_time32 +#endif + #ifndef SYS_gettimeofday #define SYS_gettimeofday SYS_gettimeofday_time32 #endif +#ifndef SYS_settimeofday +#define SYS_settimeofday SYS_settimeofday_time32 +#endif + /* Ensure that the plain syscall names are defined even for "time64-only" * archs. These facilitate callers passing null time arguments, and make * tests for establishing which to use/fallback-to more consistent when -- cgit v1.2.1