svn commit: r352095 - head/contrib/compiler-rt/lib/sanitizer_common

Ed Maste emaste at FreeBSD.org
Mon Sep 9 18:32:30 UTC 2019


Author: emaste
Date: Mon Sep  9 18:32:29 2019
New Revision: 352095
URL: https://svnweb.freebsd.org/changeset/base/352095

Log:
  compiler-rt: use more __sanitizer_time_t on FreeBSD
  
  A few structs were using long for time_t members.
  
  Obtained from:	LLVM r370755

Modified:
  head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h

Modified: head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
==============================================================================
--- head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h	Mon Sep  9 18:27:52 2019	(r352094)
+++ head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h	Mon Sep  9 18:32:29 2019	(r352095)
@@ -115,15 +115,21 @@ namespace __sanitizer {
     long key;
   };
 
+#if defined(__LP64___)
+  typedef long long __sanitizer_time_t;
+#else
+  typedef long __sanitizer_time_t;
+#endif
+
   struct __sanitizer_shmid_ds {
     __sanitizer_ipc_perm shm_perm;
     unsigned long shm_segsz;
     unsigned int shm_lpid;
     unsigned int shm_cpid;
     int shm_nattch;
-    unsigned long shm_atime;
-    unsigned long shm_dtime;
-    unsigned long shm_ctime;
+    __sanitizer_time_t shm_atime;
+    __sanitizer_time_t shm_dtime;
+    __sanitizer_time_t shm_ctime;
   };
 
   extern unsigned struct_msqid_ds_sz;
@@ -154,12 +160,12 @@ namespace __sanitizer {
     char *pw_passwd;
     int pw_uid;
     int pw_gid;
-    long pw_change;
+    __sanitizer_time_t pw_change;
     char *pw_class;
     char *pw_gecos;
     char *pw_dir;
     char *pw_shell;
-    long pw_expire;
+    __sanitizer_time_t pw_expire;
     int pw_fields;
   };
 
@@ -169,12 +175,6 @@ namespace __sanitizer {
     int gr_gid;
     char **gr_mem;
   };
-
-#if defined(__LP64___)
-  typedef long long __sanitizer_time_t;
-#else
-  typedef long __sanitizer_time_t;
-#endif
 
   typedef long __sanitizer_suseconds_t;
 


More information about the svn-src-all mailing list