<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4a95522133a10539e4ca53fe025cbaa91961bd43">https://github.com/macports/macports-ports/commit/4a95522133a10539e4ca53fe025cbaa91961bd43</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4a95522133a llvm/clang-10: support arm64
</span>4a95522133a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4a95522133a10539e4ca53fe025cbaa91961bd43
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jan 14 03:17:06 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    llvm/clang-10: support arm64
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    these versions of llvm and clang are needed
</span><span style='display:block; white-space:pre;color:#404040;'>    for some ports to build (qt5-qtcreator, eg).
</span>---
 lang/llvm-10/Portfile                              |  12 +-
 .../2003-patch-compiler-rt-support-arm64.diff      | 161 +++++++++++++++++++++
 2 files changed, 169 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-10/Portfile b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3bb84d5421..d8b4e0a1738 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,6 +143,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span>         1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
         2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
         2002-Work-around-no-libdispatch-on-10.6.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        2003-patch-compiler-rt-support-arm64.diff \
</span>         3001-Fix-missing-long-long-math-prototypes-when-using-the.patch \
         3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
         openmp-locations.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,11 +208,11 @@ configure.args-append \
</span>     -DFFI_INCLUDE_DIR=`pkg-config --cflags-only-I libffi | sed 's/-I//'` \
     -DFFI_LIBRARY_DIR=${prefix}/lib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} >= 19 && ${build_arch} ne "arm64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # TODO - see if this is still valid now that the arm compiler-rt patch has been added
</span>     # prevent compiler_rt from opportunistically trying to build arm64, which fails
     # See:  https://trac.macports.org/ticket/61477
     # and https://github.com/macports/macports-ports/pull/9139
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    supported_archs x86_64
</span>     configure.args-append -DDARWIN_osx_ARCHS="x86_64\;x86_64h"
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,7 +290,7 @@ platform darwin {
</span> 
     configure.cxx_stdlib libc++
     depends_lib-append port:libcxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    supported_archs i386 x86_64 arm64
</span> 
     pre-fetch {
         if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,7 +588,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>                 ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
         }
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants-append +libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # at present, only the non-arm archs can use this variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${build_arch} in "x86_64 i386 ppc64 ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants-append +libstdcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     post-patch {
         reinplace "s|@@PREFIX@@|${prefix}|" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-10/files/2003-patch-compiler-rt-support-arm64.diff b/lang/llvm-10/files/2003-patch-compiler-rt-support-arm64.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e35657c9afb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/files/2003-patch-compiler-rt-support-arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,161 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b2303debfa63b60c21c93c318bed63341564a549 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Steven Wu <stevenwu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 25 Jun 2020 16:44:13 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [compiler-rt] Add support for arm64 macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Summary: Allow compiler-rt to build for arm64 support on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewers: arphaman, doug.gregor, dexonsmith
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed By: arphaman, dexonsmith
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subscribers: dberris, mgorny, kristof.beyls, jkorous, ributzka, danielkiss, #sanitizers, llvm-commits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tags: #sanitizers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Differential Revision: https://reviews.llvm.org/D82610
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../cmake/Modules/CompilerRTDarwinUtils.cmake | 47 ++++++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt/cmake/builtin-config-ix.cmake     | 23 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../sanitizer_platform_interceptors.h         |  2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../sanitizer_platform_limits_posix.cpp       |  4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 60 insertions(+), 16 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 657d2c97eac8..425de8bffdf7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,25 +169,46 @@ function(darwin_test_archs os valid_archs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CACHE STRING "List of valid architectures for platform ${os}." FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# This function checks the host cpusubtype to see if it is post-haswell. Haswell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# and later machines can run x86_64h binaries. Haswell is cpusubtype 8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This function checks the host cputype/cpusubtype to filter supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# architecture for the host OS. This is used to determine which tests are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# available for the host.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function(darwin_filter_host_archs input output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   list_intersect(tmp_var DARWIN_osx_ARCHS ${input})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    COMMAND sysctl hw.cpusubtype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    OUTPUT_VARIABLE SUBTYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  string(REGEX MATCH "hw.cpusubtype: ([0-9]*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-         SUBTYPE_MATCHED "${SUBTYPE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(HASWELL_SUPPORTED Off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if(SUBTYPE_MATCHED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    if(${CMAKE_MATCH_1} GREATER 7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      set(HASWELL_SUPPORTED On)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    COMMAND sysctl hw.cputype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    OUTPUT_VARIABLE CPUTYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  string(REGEX MATCH "hw.cputype: ([0-9]*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++         CPUTYPE_MATCHED "${CPUTYPE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(ARM_HOST Off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if(CPUTYPE_MATCHED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    # ARM cputype is (0x01000000 | 12) and X86(_64) is always 7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if(${CMAKE_MATCH_1} GREATER 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      set(ARM_HOST On)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if(NOT HASWELL_SUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    list(REMOVE_ITEM tmp_var x86_64h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if(ARM_HOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    list(REMOVE_ITEM tmp_var i386)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    list(REMOVE_ITEM tmp_var arm64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    list(REMOVE_ITEM tmp_var arm64e)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      COMMAND sysctl hw.cpusubtype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      OUTPUT_VARIABLE SUBTYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    string(REGEX MATCH "hw.cpusubtype: ([0-9]*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           SUBTYPE_MATCHED "${SUBTYPE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(HASWELL_SUPPORTED Off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if(SUBTYPE_MATCHED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      if(${CMAKE_MATCH_1} GREATER 7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        set(HASWELL_SUPPORTED On)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if(NOT HASWELL_SUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      list(REMOVE_ITEM tmp_var x86_64h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(${output} ${tmp_var} PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/projects/compiler-rt/cmake/builtin-config-ix.cmake b/projects/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5f4275ae54d4..8de901513beb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/compiler-rt/cmake/builtin-config-ix.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,11 +64,34 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   find_darwin_sdk_dir(DARWIN_tvossim_SYSROOT appletvsimulator)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   find_darwin_sdk_dir(DARWIN_tvos_SYSROOT appletvos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # Get supported architecture from SDKSettings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  function(sdk_has_arch_support sdk_path os arch has_support)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    execute_process(COMMAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        /usr/libexec/PlistBuddy -c "Print :SupportedTargets:${os}:Archs" ${sdk_path}/SDKSettings.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      OUTPUT_VARIABLE SDK_SUPPORTED_ARCHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      RESULT_VARIABLE PLIST_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if (PLIST_ERROR EQUAL 0 AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        SDK_SUPPORTED_ARCHS MATCHES " ${arch}\n")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      message(STATUS "Found ${arch} support in ${sdk_path}/SDKSettings.plist")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      set("${has_support}" On PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      message(STATUS "No ${arch} support in ${sdk_path}/SDKSettings.plist")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      set("${has_support}" Off PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endfunction()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(DARWIN_EMBEDDED_PLATFORMS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(DARWIN_osx_BUILTIN_MIN_VER 10.5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(DARWIN_osx_BUILTIN_MIN_VER_FLAG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       -mmacosx-version-min=${DARWIN_osx_BUILTIN_MIN_VER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # Add support for arm64 macOS if available in SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  foreach(arch ${ARM64})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    sdk_has_arch_support(${DARWIN_osx_SYSROOT} macosx ${arch} MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if (MACOS_ARM_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++     list(APPEND DARWIN_osx_BUILTIN_ALL_POSSIBLE_ARCHS ${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endforeach(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(COMPILER_RT_ENABLE_IOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     list(APPEND DARWIN_EMBEDDED_PLATFORMS ios)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9dd6d285f594..561ce2ac176d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,7 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SANITIZER_INTERCEPT_STATFS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID || SI_SOLARIS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SANITIZER_INTERCEPT_STATFS64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  ((SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  (((SI_MAC && !TARGET_CPU_ARM64) && !SI_IOS) || SI_LINUX_NOT_ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SANITIZER_INTERCEPT_STATVFS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (SI_FREEBSD || SI_NETBSD || SI_OPENBSD || SI_LINUX_NOT_ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SANITIZER_INTERCEPT_STATVFS64 SI_LINUX_NOT_ANDROID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e71515f12e94..664d1c516f63 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,7 +170,7 @@ typedef struct user_fpregs elf_fpregset_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace __sanitizer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_utsname_sz = sizeof(struct utsname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_stat_sz = sizeof(struct stat);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !SANITIZER_IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !SANITIZER_IOS && !(SANITIZER_MAC && TARGET_CPU_ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_stat64_sz = sizeof(struct stat64);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // !SANITIZER_IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_rusage_sz = sizeof(struct rusage);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +197,7 @@ namespace __sanitizer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_regex_sz = sizeof(regex_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_regmatch_sz = sizeof(regmatch_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if SANITIZER_MAC && !SANITIZER_IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (SANITIZER_MAC && !TARGET_CPU_ARM64) && !SANITIZER_IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   unsigned struct_statfs64_sz = sizeof(struct statfs64);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // SANITIZER_MAC && !SANITIZER_IOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>