Merge commit '79b1137666da' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 5a13a608e9bb · 2024-06-05T08:58:56.000+02:00
diff --git a/flang/runtime/time-intrinsic.cpp b/flang/runtime/time-intrinsic.cpp
@@ -400,7 +400,7 @@ void RTNAME(Etime)(const Descriptor *values, const Descriptor *time,
   }
 #else
   struct tms tms;
-  if (times(&tms) != -1) {
+  if (times(&tms) != (clock_t)-1) {
     usrTime = ((double)(tms.tms_utime)) / sysconf(_SC_CLK_TCK);
     sysTime = ((double)(tms.tms_stime)) / sysconf(_SC_CLK_TCK);
     realTime = usrTime + sysTime;

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ void RTNAME(Etime)(const Descriptor values, const Descriptor time,`
`400`	`400`	`}`
`401`	`401`	`#else`
`402`	`402`	`struct tms tms;`
`403`		`- if (times(&tms) != -1) {`
	`403`	`+ if (times(&tms) != (clock_t)-1) {`
`404`	`404`	`usrTime = ((double)(tms.tms_utime)) / sysconf(_SC_CLK_TCK);`
`405`	`405`	`sysTime = ((double)(tms.tms_stime)) / sysconf(_SC_CLK_TCK);`
`406`	`406`	`realTime = usrTime + sysTime;`