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

[Ed Maste]

Author: emaste
Date: Fri Sep 27 13:14:36 2019
New Revision: 352792
URL: https://svnweb.freebsd.org/changeset/base/352792

Log:
  compiler-rt: correct RISC-V struct_kernel_stat64_sz
  
  The value of struct_kernel_stat64_sz introduced by review D5021 for
  RISC-V was incorrect.
  
  Also add a __riscv_xlen == 64 conditional as the 32-bit ABI is not yet
  finalized.
  
  Submitted by:	Luís Marques
  Differential Revision:	https://reviews.freebsd.org/D21684

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

Modified: head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
==============================================================================
--- head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h	Fri Sep 27 10:19:28 2019	(r352791)
+++ head/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h	Fri Sep 27 13:14:36 2019	(r352792)
@@ -79,10 +79,9 @@ namespace __sanitizer {
 #elif defined(__powerpc64__)
   const unsigned struct_kernel_stat_sz = 144;
   const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__riscv)
-  /* RISCVTODO: check that these values are correct */
+#elif defined(__riscv) && __riscv_xlen == 64
   const unsigned struct_kernel_stat_sz = 128;
-  const unsigned struct_kernel_stat64_sz = 128;
+  const unsigned struct_kernel_stat64_sz = 104;
 #elif defined(__mips__)
   const unsigned struct_kernel_stat_sz =
                  SANITIZER_ANDROID ? FIRST_32_SECOND_64(104, 128) :