This is an archive of the discontinued LLVM Phabricator instance.

Differential D111267

[clang] Fix darwin REQUIRES test annotation (NFC)
ClosedPublic

Authored by keith on Oct 6 2021, 1:30 PM.

Details

Reviewers
None
Commits
rG9f9ed7a81ab8: [clang] Fix darwin REQUIRES test annotation (NFC)
Summary

Some subprojects like compiler-rt define the darwin feature in their
lit config, but clang does not do that, so we need to use the global
system-darwin here instead.

Diff Detail

Event Timeline

keith requested review of this revision.Oct 6 2021, 1:30 PM
keith created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 6 2021, 1:30 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B127383: Diff 377665.Oct 6 2021, 2:56 PM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 7 2021, 12:59 PM
Closed by commit rG9f9ed7a81ab8: [clang] Fix darwin REQUIRES test annotation (NFC) (authored by keith). · Explain Why
This revision was automatically updated to reflect the committed changes.
keith added a commit: rG9f9ed7a81ab8: [clang] Fix darwin REQUIRES test annotation (NFC).

Revision Contents

PathSize
clang/
test/
Driver/
2 lines
2 lines
2 lines

Diff 377980

clang/test/Driver/apple-arm64-arch.c

// RUN: env SDKROOT="/" %clang -arch arm64 -c -### %s 2>&1 | \ // RUN: env SDKROOT="/" %clang -arch arm64 -c -### %s 2>&1 | \
// RUN: FileCheck %s // RUN: FileCheck %s
// //
// REQUIRES: darwin // REQUIRES: system-darwin
// XFAIL: apple-silicon-mac // XFAIL: apple-silicon-mac
// //
// CHECK: "-triple" "arm64-apple-ios{{[0-9.]+}}" // CHECK: "-triple" "arm64-apple-ios{{[0-9.]+}}"

clang/test/Driver/darwin-warning-options.c

// REQUIRES: darwin // REQUIRES: system-darwin
// Always error about undefined 'TARGET_OS_*' macros on Darwin. // Always error about undefined 'TARGET_OS_*' macros on Darwin.
// RUN: %clang -### %s 2>&1 | FileCheck %s // RUN: %clang -### %s 2>&1 | FileCheck %s
// CHECK-DAG: "-Wundef-prefix=TARGET_OS_" // CHECK-DAG: "-Wundef-prefix=TARGET_OS_"
// CHECK-DAG: "-Werror=undef-prefix" // CHECK-DAG: "-Werror=undef-prefix"

clang/test/Driver/mtargetos-darwin.c

// RUN: %clang -mtargetos=macos11 -arch arm64 -arch x86_64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=MACOS %s // RUN: %clang -mtargetos=macos11 -arch arm64 -arch x86_64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=MACOS %s
// RUN: %clang -mtargetos=ios14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=IOS %s // RUN: %clang -mtargetos=ios14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=IOS %s
// RUN: %clang -mtargetos=ios14-simulator -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=IOS_SIM %s // RUN: %clang -mtargetos=ios14-simulator -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=IOS_SIM %s
// RUN: %clang -mtargetos=ios14-macabi -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=MACCATALYST %s // RUN: %clang -mtargetos=ios14-macabi -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=MACCATALYST %s
// RUN: %clang -mtargetos=tvos14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=TVOS %s // RUN: %clang -mtargetos=tvos14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=TVOS %s
// RUN: %clang -mtargetos=watchos7.1 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=WATCHOS %s // RUN: %clang -mtargetos=watchos7.1 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=WATCHOS %s
// RUN: %clang -target arm64-apple-ios14 -mtargetos=ios14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOMIX1 %s // RUN: %clang -target arm64-apple-ios14 -mtargetos=ios14 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOMIX1 %s
// RUN: %clang -mtargetos=ios14 -arch arm64 -miphoneos-version-min=14 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOMIX2 %s // RUN: %clang -mtargetos=ios14 -arch arm64 -miphoneos-version-min=14 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOMIX2 %s
// RUN: %clang -mtargetos=darwin20 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=INVALIDOS %s // RUN: %clang -mtargetos=darwin20 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=INVALIDOS %s
// RUN: %clang -mtargetos=ios -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOVERSION %s // RUN: %clang -mtargetos=ios -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOVERSION %s
// REQUIRES: darwin // REQUIRES: system-darwin
// MACOS: "-cc1" "-triple" "arm64-apple-macosx11.0.0" // MACOS: "-cc1" "-triple" "arm64-apple-macosx11.0.0"
// MACOS-NEXT: "-cc1" "-triple" "x86_64-apple-macosx11.0.0" // MACOS-NEXT: "-cc1" "-triple" "x86_64-apple-macosx11.0.0"
// IOS: "-cc1" "-triple" "arm64-apple-ios14.0.0" // IOS: "-cc1" "-triple" "arm64-apple-ios14.0.0"
// IOS_SIM: "-cc1" "-triple" "arm64-apple-ios14.0.0-simulator" // IOS_SIM: "-cc1" "-triple" "arm64-apple-ios14.0.0-simulator"
// MACCATALYST: "-cc1" "-triple" "arm64-apple-ios14.0.0-macabi" // MACCATALYST: "-cc1" "-triple" "arm64-apple-ios14.0.0-macabi"
// TVOS: "-cc1" "-triple" "arm64-apple-tvos14.0.0" // TVOS: "-cc1" "-triple" "arm64-apple-tvos14.0.0"
// WATCHOS: "-cc1" "-triple" "arm64-apple-watchos7.1.0" // WATCHOS: "-cc1" "-triple" "arm64-apple-watchos7.1.0"
// NOMIX1: error: cannot specify '-mtargetos=ios14' along with '-target arm64-apple-ios14' // NOMIX1: error: cannot specify '-mtargetos=ios14' along with '-target arm64-apple-ios14'
// NOMIX2: error: cannot specify '-miphoneos-version-min=14' along with '-mtargetos=ios14' // NOMIX2: error: cannot specify '-miphoneos-version-min=14' along with '-mtargetos=ios14'
// INVALIDOS: error: invalid OS value 'darwin20' in '-mtargetos=darwin20' // INVALIDOS: error: invalid OS value 'darwin20' in '-mtargetos=darwin20'
// NOVERSION: error: invalid version number in '-mtargetos=ios' // NOVERSION: error: invalid version number in '-mtargetos=ios'