From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- ...revert-llvmorg-19-init-6898-g60deb8b39afe.patch | 66 ---------------------- 1 file changed, 66 deletions(-) delete mode 100644 build/build-clang/revert-llvmorg-19-init-6898-g60deb8b39afe.patch (limited to 'build/build-clang/revert-llvmorg-19-init-6898-g60deb8b39afe.patch') diff --git a/build/build-clang/revert-llvmorg-19-init-6898-g60deb8b39afe.patch b/build/build-clang/revert-llvmorg-19-init-6898-g60deb8b39afe.patch deleted file mode 100644 index f6a566c199..0000000000 --- a/build/build-clang/revert-llvmorg-19-init-6898-g60deb8b39afe.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3675bcd1e8d3026aa5f1c232986ce43c7cf72cd9 Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Fri, 5 Apr 2024 05:59:19 +0900 -Subject: [PATCH 3/4] Revert "[InstallAPI][test] Tweak test to run on older CI - config" - -This reverts commit 60deb8b39afe9be90e30aa18d77ad129dacd4d55. ---- - clang/test/InstallAPI/diagnostics-dsym.test | 26 ++++++++++++--------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/clang/test/InstallAPI/diagnostics-dsym.test b/clang/test/InstallAPI/diagnostics-dsym.test -index 45c69c09d286..ee2c8b32df29 100644 ---- a/clang/test/InstallAPI/diagnostics-dsym.test -+++ b/clang/test/InstallAPI/diagnostics-dsym.test -@@ -4,20 +4,20 @@ - ; RUN: split-file %s %t - - // Build a simple dylib with debug info. --; RUN: %clang --target=x86_64-apple-macos10.15 -g -dynamiclib %t/foo.c \ -+; RUN: %clang --target=arm64-apple-macos13 -g -dynamiclib %t/foo.c \ - ; RUN: -current_version 1 -compatibility_version 1 -L%t/usr/lib \ - ; RUN: -save-temps \ - ; RUN: -o %t/foo.dylib -install_name %t/foo.dylib - ; RUN: dsymutil %t/foo.dylib -o %t/foo.dSYM - --; RUN: not clang-installapi -x c++ --target=x86_64-apple-macos10.15 \ -+; RUN: not clang-installapi -x c++ --target=arm64-apple-macos13 \ - ; RUN: -install_name %t/foo.dylib \ - ; RUN: -current_version 1 -compatibility_version 1 \ - ; RUN: -o %t/output.tbd \ - ; RUN: --verify-against=%t/foo.dylib --dsym=%t/foo.dSYM \ - ; RUN: --verify-mode=Pedantic 2>&1 | FileCheck %s - --; CHECK: violations found for x86_64 -+; CHECK: violations found for arm64 - ; CHECK: foo.c:5:0: error: no declaration found for exported symbol 'bar' in dynamic library - ; CHECK: foo.c:1:0: error: no declaration found for exported symbol 'foo' in dynamic library - -@@ -29,11 +29,15 @@ extern char bar; - char bar = 'a'; - - ;--- usr/lib/libSystem.tbd ----- !tapi-tbd --tbd-version: 4 --targets: [ x86_64-macos ] --install-name: '/usr/lib/libSystem.B.dylib' --exports: -- - targets: [ x86_64-macos ] -- symbols: [ dyld_stub_binder ] --... -+{ -+ "main_library": { -+ "install_names": [ -+ {"name": "/usr/lib/libSystem.B.dylib"} -+ ], -+ "target_info": [ -+ {"target": "arm64-macos"} -+ ] -+ }, -+ "tapi_tbd_version": 5 -+} -+ --- -2.44.0.1.g9765aa7075 - -- cgit v1.2.3