[compiler-rt] Fix os version check on ios <= 12

Fix compiler-rt installation directory
wimal-build · Nov 28, 2024 · 1a87d5d · 1a87d5d
1 parent d57c740
commit 1a87d5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.ci/azure.yml b/.ci/azure.yml
@@ -63,7 +63,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnu
           -DWIMAL_TARGET=x64-linux
@@ -89,7 +89,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=aarch64-linux-gnu
           -DWIMAL_TARGET=a64-linux
@@ -115,7 +115,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=armv7-none-linux-androideabi
           -DWIMAL_TARGET=arm-android
@@ -141,7 +141,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=aarch64-none-linux-android
           -DWIMAL_TARGET=a64-android
@@ -167,7 +167,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=i686-none-linux-android
           -DWIMAL_TARGET=x86-android
@@ -193,7 +193,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCMAKE_TOOLCHAIN_FILE=../../wimal-cmake/MeToolchain.cmake
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=x86_64-none-linux-android
           -DWIMAL_TARGET=x64-android
@@ -219,7 +219,7 @@ jobs:
           cmake ../../compiler-rt
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/12.0.0"
+          -DCMAKE_INSTALL_PREFIX="$(Build.BinariesDirectory)/wimal/lib/clang/19"
           -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin
           -DCOMPILER_RT_BUILD_BUILTINS=ON
           -DCOMPILER_RT_BUILD_CRT=OFF

diff --git a/compiler-rt/lib/builtins/os_version_check.c b/compiler-rt/lib/builtins/os_version_check.c
@@ -86,10 +86,6 @@ typedef Boolean (*CFStringGetCStringFuncTy)(CFStringRef, char *, CFIndex,
                                             CFStringEncoding);
 typedef void (*CFReleaseFuncTy)(CFTypeRef);
 
-extern __attribute__((weak_import))
-bool _availability_version_check(uint32_t count,
-                                 dyld_build_version_t versions[]);
-
 static void _initializeAvailabilityCheck(bool LoadPlist) {
   if (AvailabilityVersionCheck && !LoadPlist) {
     // New API is supported and we're not being asked to load the plist,
@@ -98,8 +94,8 @@ static void _initializeAvailabilityCheck(bool LoadPlist) {
   }
 
   // Use the new API if it's is available.
-  if (_availability_version_check)
-    AvailabilityVersionCheck = &_availability_version_check;
+  AvailabilityVersionCheck = (AvailabilityVersionCheckFuncTy)dlsym(
+      RTLD_DEFAULT, "_availability_version_check");
 
   if (AvailabilityVersionCheck && !LoadPlist) {
     // New API is supported and we're not being asked to load the plist,