From 30a876f2ca438ebbd1db53c5008759f565940d2b Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 5 Apr 2024 05:59:08 +0900 Subject: [PATCH 1/4] Revert "[InstallAPI] Fixup dsym test (#87299)" This reverts commit 30fd099d5062638b5fe6b89135ad6433a888023a. --- clang/test/InstallAPI/diagnostics-dsym.test | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/clang/test/InstallAPI/diagnostics-dsym.test b/clang/test/InstallAPI/diagnostics-dsym.test index c9cbeffef7ba..8a1b394f2f86 100644 --- a/clang/test/InstallAPI/diagnostics-dsym.test +++ b/clang/test/InstallAPI/diagnostics-dsym.test @@ -1,24 +1,23 @@ -; REQUIRES: system-darwin -; REQUIRES: target-aarch64 +; REQUIRES: 86_64-darwin ; RUN: rm -rf %t ; RUN: split-file %s %t // Build a simple dylib with debug info. -; RUN: %clang --target=arm64-apple-macos11 -g -dynamiclib %t/foo.c \ +; RUN: %clang --target=x86_64-apple-macos10.15 -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=arm64-apple-macos11 \ +; RUN: not clang-installapi -x c++ --target=x86_64-apple-macos10.15 \ ; 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 arm64 +; CHECK: violations found for x86_64 ; 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 @@ -32,9 +31,9 @@ char bar = 'a'; ;--- usr/lib/libSystem.tbd --- !tapi-tbd tbd-version: 4 -targets: [ arm64-macos ] +targets: [ x86_64-macos ] install-name: '/usr/lib/libSystem.B.dylib' exports: - - targets: [ arm64-macos ] + - targets: [ x86_64-macos ] symbols: [ dyld_stub_binder ] ... -- 2.44.0.1.g9765aa7075