From owner-svn-src-head@freebsd.org Mon Sep 9 18:32:30 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05E36DB7DE; Mon, 9 Sep 2019 18:32:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Rxbd6RXWz4NPB; Mon, 9 Sep 2019 18:32:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1ACA19CD2; Mon, 9 Sep 2019 18:32:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x89IWTKq019771; Mon, 9 Sep 2019 18:32:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x89IWTHj019770; Mon, 9 Sep 2019 18:32:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201909091832.x89IWTHj019770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 9 Sep 2019 18:32:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352095 - head/contrib/compiler-rt/lib/sanitizer_common X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/compiler-rt/lib/sanitizer_common X-SVN-Commit-Revision: 352095 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2019 18:32:30 -0000 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;