Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
@@ -114,15 +114,21 @@
     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;
@@ -153,12 +159,12 @@
     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 @@
     char **gr_mem;
   };
 
-#if defined(__LP64___)
-  typedef long long __sanitizer_time_t;
-#else
-  typedef long __sanitizer_time_t;
-#endif
-
   typedef long __sanitizer_suseconds_t;
 
   struct __sanitizer_timeval {