Skip to content

Commit

Permalink
Merge pull request #122 from regro-cf-autotick-bot/19.1.0_hc8c93a
Browse files Browse the repository at this point in the history
compiler-rt v19.1.0
  • Loading branch information
h-vetinari authored Sep 20, 2024
2 parents 3881104 + 79ff1b5 commit 9108d0f
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 36 deletions.
5 changes: 4 additions & 1 deletion build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "18.1.8" %}
{% set version = "19.1.0" %}
{% set major_ver = version.split('.')[0] %}

package:
Expand All @@ -7,13 +7,13 @@ package:

source:
url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz
sha256: 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856
sha256: 0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe
patches:
- patches/0001-no-code-sign.patch
- patches/0002-Revert-Declare-_availability_version_check-as-weak_i.patch

build:
number: 1
number: 0

requirements:
build:
Expand Down Expand Up @@ -45,8 +45,8 @@ outputs:
host:
run:
- clang {{ version }}
- clangxx {{ version }}
run_constrained:
- clangxx {{ version }}
- compiler-rt {{ version }}
files:
- lib/clang/{{ major_ver }}/lib # [unix]
Expand All @@ -66,7 +66,6 @@ outputs:
host:
run:
- clang {{ version }}
- clangxx {{ version }}
- compiler-rt_{{ target_platform }} {{ version }}
files:
- lib/clang/{{ major_ver }}/share # [unix]
Expand Down
59 changes: 31 additions & 28 deletions recipe/patches/0001-no-code-sign.patch
Original file line number Diff line number Diff line change
@@ -1,47 +1,50 @@
From dd35ef6087b81d9d7fc658f1c35557eec1cb733f Mon Sep 17 00:00:00 2001
From 3f0b22d7746015db51f0fc59068683e6c459d45a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 22 Apr 2019 02:00:30 -0500
Subject: [PATCH 1/2] no code sign

---
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 28 -------------------
1 file changed, 28 deletions(-)
compiler-rt/cmake/Modules/AddCompilerRT.cmake | 31 -------------------
1 file changed, 31 deletions(-)

diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index e0400a8ea952..ee51eb5bc514 100644
index 6962b733733a..9afc70e072ab 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -392,34 +392,6 @@ function(add_compiler_rt_runtime name type)
@@ -388,37 +388,6 @@ function(add_compiler_rt_runtime name type)
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
endif()
- if (APPLE AND NOT CMAKE_LINKER MATCHES ".*lld.*")
- # Ad-hoc sign the dylibs when using Xcode versions older than 12.
- # Xcode 12 shipped with ld64-609.
- # FIXME: Remove whole conditional block once everything uses Xcode 12+.
- set(LD_V_OUTPUT)
- # Apple's linker signs the resulting dylib with an ad-hoc code signature in
- # most situations, except:
- # 1. Versions of ld64 prior to ld64-609 in Xcode 12 predate this behavior.
- # 2. Apple's new linker does not when building with `-darwin-target-variant`
- # to support macOS Catalyst.
- #
- # Explicitly re-signing the dylib works around both of these issues. The
- # signature is marked as `linker-signed` when that is supported so that it
- # behaves as expected when processed by subsequent tooling.
- #
- # Detect whether `codesign` supports `-o linker-signed` by passing it as an
- # argument and looking for `invalid argument "linker-signed"` in its output.
- # FIXME: Remove this once all supported toolchains support `-o linker-signed`.
- execute_process(
- COMMAND sh -c "${CMAKE_LINKER} -v 2>&1 | head -1"
- RESULT_VARIABLE HAD_ERROR
- OUTPUT_VARIABLE LD_V_OUTPUT
- COMMAND sh -c "codesign -f -s - -o linker-signed this-does-not-exist 2>&1 | grep -q linker-signed"
- RESULT_VARIABLE CODESIGN_SUPPORTS_LINKER_SIGNED
- )
- if (HAD_ERROR)
- message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}")
- endif()
- set(NEED_EXPLICIT_ADHOC_CODESIGN 1)
- if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*")
- string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT})
- if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609)
- set(NEED_EXPLICIT_ADHOC_CODESIGN 0)
- endif()
- endif()
- if (NEED_EXPLICIT_ADHOC_CODESIGN)
- add_custom_command(TARGET ${libname}
- POST_BUILD
- COMMAND codesign --sign - $<TARGET_FILE:${libname}>
- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR}
- )
-
- set(EXTRA_CODESIGN_ARGUMENTS)
- if (CODESIGN_SUPPORTS_LINKER_SIGNED)
- list(APPEND EXTRA_CODESIGN_ARGUMENTS -o linker-signed)
- endif()
-
- add_custom_command(TARGET ${libname}
- POST_BUILD
- COMMAND codesign --sign - ${EXTRA_CODESIGN_ARGUMENTS} $<TARGET_FILE:${libname}>
- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR}
- COMMAND_EXPAND_LISTS
- )
- endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d37bc1428cd192a6fa3a967a509805b95a761910 Mon Sep 17 00:00:00 2001
From 3752b27ad235cd1126f72929d982bbecb27985ad Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Mon, 2 Sep 2024 14:30:13 +1100
Subject: [PATCH 2/2] Revert "Declare _availability_version_check as
Expand All @@ -10,7 +10,7 @@ This reverts commit b653a2823fe4b4c9c6d85cfe119f31d8e70c2fa0.
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/lib/builtins/os_version_check.c b/compiler-rt/lib/builtins/os_version_check.c
index 182eabe7a6ae..ebfb2dfc72dd 100644
index 01fae834ab21..5febb79c0749 100644
--- 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,
Expand Down

0 comments on commit 9108d0f

Please sign in to comment.