Implement and use new parsers of clock_gettime and clock_settime syscalls

* time.c (SYS_FUNC(clock_gettime), SYS_FUNC(clock_settime)): Remove.
[HAVE_ARCH_TIME32_SYSCALLS] (SYS_FUNC(clock_gettime32),
SYS_FUNC(clock_settime32)): New functions.
* linux/dummy.h (sys_clock_getres): Remove.
(sys_clock_getres_time32): Redirect to sys_clock_gettime32.
* linux/64/syscallent.h: Replace SEN(clock_gettime), SEN(clock_settime),
and SEN(clock_getres) with SEN(clock_gettime64), SEN(clock_settime64),
and SEN(clock_getres_time64), respectively.
* 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_gettime), SEN(clock_settime),
and SEN(clock_getres) with SEN(clock_gettime32), SEN(clock_settime32),
and SEN(clock_getres_time32), respectively.
* 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.

diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h
index 740af60e2a222de43eb74baaea7f2174cdc95a52..95e28a36bf696202411673b36d7831183cc5b666 100644 (file)
--- a/linux/32/syscallent.h
+++ b/linux/32/syscallent.h
@@ -124,9 +124,9 @@
 [109] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [110] = { 4,   0,              SEN(timer_settime),             "timer_settime"         },
 [111] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[112] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[113] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[114] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [116] = { 3,   0,              SEN(syslog),                    "syslog"                },
 [117] = { 4,   0,              SEN(ptrace),                    "ptrace"                },

diff --git a/linux/64/syscallent.h b/linux/64/syscallent.h
index 0b17f2850ca780d4d58cee6bd1b06d457a58b454..850a1dd1567d32aeca7adfb7ef02ef19df82129a 100644 (file)
--- a/linux/64/syscallent.h
+++ b/linux/64/syscallent.h
@@ -117,9 +117,9 @@
 [109] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [110] = { 4,   0,              SEN(timer_settime),             "timer_settime"         },
 [111] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[112] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[113] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[114] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [116] = { 3,   0,              SEN(syslog),                    "syslog"                },
 [117] = { 4,   0,              SEN(ptrace),                    "ptrace"                },

diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
index 59cf73f750c6854ef501dcc6912c28844b53d91d..ae3d23a65510adcb425c2ab7b8f348c65a34b3a4 100644 (file)
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@@ -362,9 +362,9 @@
 [416] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [417] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [418] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[419] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[420] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[421] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [423] = { 4,   TI,             SEN(semtimedop_time64),         "semtimedop"            },
 [424] = { 3,   TS,             SEN(tgkill),                    "tgkill"                },

diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index a463c59b2eae7377244b6088c6b00d90fb8fae09..644369f2993d53f9df6c440948d228d8cd30f50a 100644 (file)
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -269,9 +269,9 @@
 [259] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [260] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [261] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[262] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[263] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[264] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [266] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [267] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h
index 6d7cdda906d7ab3241c3ff614381ec0abbe5f42a..658c8a2fddb211d4a930740eff93bc28d05efef7 100644 (file)
--- a/linux/avr32/syscallent.h
+++ b/linux/avr32/syscallent.h
@@ -221,9 +221,9 @@
 [212] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [213] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [214] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[215] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[216] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[217] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [219] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [220] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
index c3f980999838cad73e402cd975a46c4764074687..6f0b954b0e1074db3544fedac4c26ff56b65722c 100644 (file)
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@@ -271,9 +271,9 @@
 [262] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [263] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [264] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[265] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[266] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[267] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [269] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [270] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/dummy.h b/linux/dummy.h
index 012c844c19abe51155fd6b2a2c91dcc0bf3ba332..dfd316c4d9a33f4526b4084dc1b5c80d872ea4e3 100644 (file)
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -40,7 +40,7 @@
 /* like another call */
 # define sys_acct              sys_chdir
 # define sys_chroot            sys_chdir
-# define sys_clock_getres      sys_clock_gettime
+# define sys_clock_getres_time32       sys_clock_gettime32
 # define sys_clock_getres_time64       sys_clock_gettime64
 # define sys_connect           sys_bind
 # define sys_fchdir            sys_close

diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index c4ec0d0a6cb355abfe6660cbac3307b64ed5a504..9c245511c8ccf72a3e4cc80158d74b6025712e2a 100644 (file)
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -258,9 +258,9 @@
 [252] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [253] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [254] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[255] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[256] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[257] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [259] = { 3,   TS,             SEN(tgkill),                    "tgkill"                },
 [260] = { 6,   TM,             SEN(mbind),                     "mbind"                 },

diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index 67e56f1b664dc4b60bef6993ddc8a3c40977ee6b..9bcb55b3fc4a632b456137a0bc6362ca16c1d7a2 100644 (file)
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -270,9 +270,9 @@
 [261] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [262] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [263] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[264] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[265] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[266] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [268] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [269] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index f76c1ebc0a822cfef72dde9acf020c22bdfc7c12..cdc72850173527f4c14f93dcde72c13dd2645de5 100644 (file)
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -236,9 +236,9 @@
 [1024 + 226] = { 2,    0,              SEN(timer_gettime),             "timer_gettime"         },
 [1024 + 227] = { 1,    0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [1024 + 228] = { 1,    0,              SEN(timer_delete),              "timer_delete"          },
-[1024 + 229] = { 2,    0,              SEN(clock_settime),             "clock_settime"         },
-[1024 + 230] = { 2,    0,              SEN(clock_gettime),             "clock_gettime"         },
-[1024 + 231] = { 2,    0,              SEN(clock_getres),              "clock_getres"          },
+[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 + 233] = { 3,    TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },
 [1024 + 234] = { 3,    TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index ebb62174ad35318bbdda73464c00ddfa0428e711..428ed6ef920595ace795cfeed951bd464160dbe7 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -265,9 +265,9 @@
 [256] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [257] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [258] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[259] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[260] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[261] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [263] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [264] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
index bf1548df8f72e7f95217b24f668991e9e4db5167..b616845a69577362f7779ff948dfdb2c0bdabda0 100644 (file)
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@@ -270,9 +270,9 @@
 [261] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [262] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [263] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[264] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[265] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[266] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [268] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [269] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h
index 67fc9f2c1f7a570eee7254b0b9f086fdd7483188..06001adfc3b37b1ff38d53a5c50fd0b23a3147c4 100644 (file)
--- a/linux/mips/syscallent-n32.h
+++ b/linux/mips/syscallent-n32.h
@@ -232,9 +232,9 @@
 [6222] = { 2,  0,              SEN(timer_gettime),             "timer_gettime"         },
 [6223] = { 1,  0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [6224] = { 1,  0,              SEN(timer_delete),              "timer_delete"          },
-[6225] = { 2,  0,              SEN(clock_settime),             "clock_settime"         },
-[6226] = { 2,  0,              SEN(clock_gettime),             "clock_gettime"         },
-[6227] = { 2,  0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [6229] = { 3,  TS,             SEN(tgkill),                    "tgkill"                },
 [6230] = { 2,  TF,             SEN(utimes),                    "utimes"                },

diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h
index 50da372729428c5ceda15e7acc83edad21d73ca9..4c2ff19a474f2c2c7f7a5c60186bdc7a0f98d4cb 100644 (file)
--- a/linux/mips/syscallent-n64.h
+++ b/linux/mips/syscallent-n64.h
@@ -228,9 +228,9 @@
 [5218] = { 2,  0,              SEN(timer_gettime),             "timer_gettime"         },
 [5219] = { 1,  0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [5220] = { 1,  0,              SEN(timer_delete),              "timer_delete"          },
-[5221] = { 2,  0,              SEN(clock_settime),             "clock_settime"         },
-[5222] = { 2,  0,              SEN(clock_gettime),             "clock_gettime"         },
-[5223] = { 2,  0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [5225] = { 3,  TS,             SEN(tgkill),                    "tgkill"                },
 [5226] = { 2,  TF,             SEN(utimes),                    "utimes"                },

diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h
index 4f6bc31d1e6b10262368e96cffb4eab5e7b12cd3..92023dd8b1f644c778aa26f2023ae9a9202f9f9c 100644 (file)
--- a/linux/mips/syscallent-o32.h
+++ b/linux/mips/syscallent-o32.h
@@ -270,9 +270,9 @@
 [4259] = { 2,  0,              SEN(timer_gettime),             "timer_gettime"         },
 [4260] = { 1,  0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [4261] = { 1,  0,              SEN(timer_delete),              "timer_delete"          },
-[4262] = { 2,  0,              SEN(clock_settime),             "clock_settime"         },
-[4263] = { 2,  0,              SEN(clock_gettime),             "clock_gettime"         },
-[4264] = { 2,  0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [4266] = { 3,  TS,             SEN(tgkill),                    "tgkill"                },
 [4267] = { 2,  TF,             SEN(utimes),                    "utimes"                },

diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index 4579488ff7f198d9d0290640a43cb1716df6bb5b..8d001062f0bd3c6996a7446e2c5e38ee89011a3c 100644 (file)
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -252,9 +252,9 @@
 [242] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [243] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [244] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[245] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[246] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[247] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [249] = { 2,   0,              SEN(printargs),                 "swapcontext"           },
 [250] = { 3,   TS,             SEN(tgkill),                    "tgkill"                },

diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h
index 01803ad6adc2e63d336d7483c54bb348f803e5f3..cc5b15a37d96b78121f076ae146936d9dc33a6da 100644 (file)
--- a/linux/powerpc64/syscallent.h
+++ b/linux/powerpc64/syscallent.h
@@ -247,9 +247,9 @@
 [242] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [243] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [244] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[245] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[246] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[247] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [249] = { 2,   0,              SEN(printargs),                 "swapcontext"           },
 [250] = { 3,   TS,             SEN(tgkill),                    "tgkill"                },

diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
index 64228c1a8e8759fccd7a1830ac8d61ac13702861..2b171e63e735981817e9b520914c9408969c9a62 100644 (file)
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@@ -268,9 +268,9 @@
 [256] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [257] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [258] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[259] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[260] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[261] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [263] = { 5,   0,              SEN(vserver),                   "vserver"               },
 [264] = { 6,   TD,             SEN(fadvise64_64),              "fadvise64_64"          },

diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
index 5d34ff8b58355a8546fac6ec16b0b7bce2199967..3848e5c300b4b1e24de6d12152de125457d99ba5 100644 (file)
--- a/linux/s390x/syscallent.h
+++ b/linux/s390x/syscallent.h
@@ -252,9 +252,9 @@
 [256] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [257] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [258] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[259] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[260] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[261] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [263] = { 5,   0,              SEN(vserver),                   "vserver"               },
 [264] = { },

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index ff8578d175a03728654c77f04a08adabb5cc5bd9..8e8ea67168af4850e7bfcde7182768126a2a429e 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -270,9 +270,9 @@
 [261] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [262] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [263] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[264] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[265] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[266] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [268] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [269] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index b441544f50fc99254d152eeb31dfeb95123f87a8..3c88eee59ead9091ae7f9173d713b3355c8f514c 100644 (file)
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -296,9 +296,9 @@
 [289] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [290] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [291] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[292] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[293] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[294] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [296] = { 3,   TF|TSF|TSFA,    SEN(statfs64),                  "statfs64"              },
 [297] = { 3,   TD|TFSF|TSFA,   SEN(fstatfs64),                 "fstatfs64"             },

diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index f470691a35cc6916f4e7550726bf12e70ca9c91d..e61d4aef422a99d177c457eb79bd17d20abfb316 100644 (file)
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -261,9 +261,9 @@
 [253] = { 1,   TD,             SEN(fdatasync),                 "fdatasync"             },
 [254] = { 3,   0,              SEN(nfsservctl),                "nfsservctl"            },
 [255] = { 6,   TD,             SEN(sync_file_range),           "sync_file_range"       },
-[256] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[257] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[258] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [260] = { 3,   0,              SEN(sched_getaffinity),         "sched_getaffinity"     },
 [261] = { 3,   0,              SEN(sched_setaffinity),         "sched_setaffinity"     },

diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index d82a3d682f5986c8a45e118b6890f58ad1dad991..c723c550fe14119f4cf0d7e38ce8e3c8b244655d 100644 (file)
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -259,9 +259,9 @@
 [253] = { 1,   TD,             SEN(fdatasync),                 "fdatasync"             },
 [254] = { 3,   0,              SEN(nfsservctl),                "nfsservctl"            },
 [255] = { 4,   TD,             SEN(sync_file_range),           "sync_file_range"       },
-[256] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[257] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[258] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [260] = { 3,   0,              SEN(sched_getaffinity),         "sched_getaffinity"     },
 [261] = { 3,   0,              SEN(sched_setaffinity),         "sched_setaffinity"     },

diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h
index e2951cd2357a2cc91eb870ea97e4f0177cd5f646..7f9172d66b899ca8767b2a14910a8cb767f04d6f 100644 (file)
--- a/linux/x32/syscallent.h
+++ b/linux/x32/syscallent.h
@@ -232,9 +232,9 @@
 [224] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [225] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [226] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[227] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[228] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[229] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [231] = { 1,   TP|SE,          SEN(exit),                      "exit_group"            },
 [232] = { 4,   TD,             SEN(epoll_wait),                "epoll_wait"            },

diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h
index ae5e7d3da2e9b60a1cf0a2c81085af3486269abd..fc759fb7c85015ee27859c5466ab4a55ee30ebec 100644 (file)
--- a/linux/x86_64/syscallent.h
+++ b/linux/x86_64/syscallent.h
@@ -232,9 +232,9 @@
 [224] = { 2,   0,              SEN(timer_gettime),             "timer_gettime"         },
 [225] = { 1,   0,              SEN(timer_getoverrun),          "timer_getoverrun"      },
 [226] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },
-[227] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[228] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[229] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [231] = { 1,   TP|SE,          SEN(exit),                      "exit_group"            },
 [232] = { 4,   TD,             SEN(epoll_wait),                "epoll_wait"            },

diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h
index 6a50ac9fe5ebc506297beb2a75f0586013f52127..6cf512374811228cc2c430c96d83b34ff518430f 100644 (file)
--- a/linux/xtensa/syscallent.h
+++ b/linux/xtensa/syscallent.h
@@ -241,9 +241,9 @@
 [241] = { 3,   0,              SEN(io_submit),                 "io_submit"             },
 [242] = { 5,   0,              SEN(io_getevents_time32),       "io_getevents"          },
 [243] = { 3,   0,              SEN(io_cancel),                 "io_cancel"             },
-[244] = { 2,   0,              SEN(clock_settime),             "clock_settime"         },
-[245] = { 2,   0,              SEN(clock_gettime),             "clock_gettime"         },
-[246] = { 2,   0,              SEN(clock_getres),              "clock_getres"          },
+[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"       },
 [248] = { 3,   0,              SEN(timer_create),              "timer_create"          },
 [249] = { 1,   0,              SEN(timer_delete),              "timer_delete"          },

diff --git a/time.c b/time.c
index 53329917fe9e723e3e5078f1ed6a7a7996a45d7f..364fca4de5954f04a732effd32b8a48000cb1e0d 100644 (file)
--- a/time.c
+++ b/time.c
@@ -234,10 +234,12 @@ do_clock_settime(struct tcb *const tcp, const print_obj_by_addr_fn print_ts)
        return RVAL_DECODED;
 }
 
-SYS_FUNC(clock_settime)
+#if HAVE_ARCH_TIME32_SYSCALLS
+SYS_FUNC(clock_settime32)
 {
-       return do_clock_settime(tcp, print_timespec);
+       return do_clock_settime(tcp, print_timespec32);
 }
+#endif
 
 SYS_FUNC(clock_settime64)
 {
@@ -256,10 +258,12 @@ do_clock_gettime(struct tcb *const tcp, const print_obj_by_addr_fn print_ts)
        return 0;
 }
 
-SYS_FUNC(clock_gettime)
+#if HAVE_ARCH_TIME32_SYSCALLS
+SYS_FUNC(clock_gettime32)
 {
-       return do_clock_gettime(tcp, print_timespec);
+       return do_clock_gettime(tcp, print_timespec32);
 }
+#endif
 
 SYS_FUNC(clock_gettime64)
 {