diff mbox series

[PATCH/committed,2/5] sim: m32r: migrate ftime() to clock_gettime()

Message ID 20240111033747.17795-2-vapier@gentoo.org
State New
Headers
Series [PATCH/committed,1/5] sim: m32r: cleanup unused variables |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 warning Patch is already merged

Commit Message

Mike Frysinger Jan. 11, 2024, 3:37 a.m. UTC 
  The ftime() function has been deprecated since POSIX-1-2004, and
removed in POSIX.1-2008.  It's also been deprecated/removed in glibc
since 2.33.  POSIX has always said the function is not portable, and
its return value, timezone, and dstflag fields are unspecified.  Even
if Linux/glibc & m32r had defined behavior, those aren't the host for
the sim runtime.

So let's stop using the function and switch to clock_gettime.  gnulib
already has detection support for it, and it's been around since at
least POSIX-1-2004.
---
 sim/m32r/traps.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/sim/m32r/traps.c b/sim/m32r/traps.c
index b779e0c3b9f5..c5191989d7fd 100644
--- a/sim/m32r/traps.c
+++ b/sim/m32r/traps.c
@@ -386,17 +386,20 @@  m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
 	  case TARGET_LINUX_SYS_ftime:
 	    {
 	      struct timeb t;
+	      struct timespec ts;
 
-	      result = ftime (&t);
+	      result = clock_gettime (CLOCK_REALTIME, &ts);
 	      errcode = errno;
 
 	      if (result != 0)
 		break;
 
-	      t.time = H2T_4 (t.time);
-	      t.millitm = H2T_2 (t.millitm);
-	      t.timezone = H2T_2 (t.timezone);
-	      t.dstflag = H2T_2 (t.dstflag);
+	      t.time = H2T_4 (ts.tv_sec);
+	      t.millitm = H2T_2 (ts.tv_nsec / 1000000);
+	      /* POSIX.1-2001 says the contents of the timezone and dstflag
+		 members of tp after a call to ftime() are unspecified.  */
+	      t.timezone = H2T_2 (0);
+	      t.dstflag = H2T_2 (0);
 	      if ((s.write_mem) (cb, &s, arg1, (char *) &t, sizeof(t))
 		  != sizeof(t))
 		{