Skip to content

Commit b458e69

Browse files
playstation-eddplaystation-edd
committed
Revert "Use --implicit-check-not instead of CHECK-XYZ-NOT"
This reverts commit 014e3dd. Reviewers agree that things were better before.
1 parent 100c3c2 commit b458e69

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

‎clang/test/Driver/ps5-linker.c‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,35 +104,38 @@
104104
// RUN: %clang --target=x86_64-sie-ps5 %s -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
105105
// RUN: %clang --target=x86_64-sie-ps5 %s -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
106106
// RUN: %clang --target=x86_64-sie-ps5 %s -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-STATIC-LIBCPP,CHECK-STATIC-LIBC,CHECK-STATIC-CORE-LIBS %s
107-
// RUN: %clang --target=x86_64-sie-ps5 %s -r -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD %s
107+
// RUN: %clang --target=x86_64-sie-ps5 %s -r -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-NO-LIBS %s
108108

109109
// RUN: %clang --target=x86_64-sie-ps5 %s -pthread -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-PTHREAD %s
110110

111-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" --check-prefixes=CHECK-LD,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
112-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -shared -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" --check-prefixes=CHECK-LD,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
113-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -static -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" --check-prefixes=CHECK-LD,CHECK-STATIC-LIBCPP,CHECK-STATIC-LIBC,CHECK-STATIC-CORE-LIBS %s
111+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
112+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-DYNAMIC-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
113+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostartfiles -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-STATIC-LIBCPP,CHECK-STATIC-LIBC,CHECK-STATIC-CORE-LIBS %s
114114

115-
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -### 2>&1 | FileCheck "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD,CHECK-MAIN-CRT %s
116-
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -shared -### 2>&1 | FileCheck "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD,CHECK-SHARED-CRT %s
117-
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -static -### 2>&1 | FileCheck "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD,CHECK-STATIC-CRT %s
115+
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-NO-LIBS %s
116+
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-NO-LIBS %s
117+
// RUN: %clang --target=x86_64-sie-ps5 %s -nodefaultlibs -pthread -fjmc -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-NO-LIBS %s
118118

119-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD %s
120-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -shared -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD %s
121-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -static -### 2>&1 | FileCheck "--implicit-check-not=\"crt{{[^\"]*}}.o\"" "--implicit-check-not=\"-l{{[^\"]*}}\"" --check-prefixes=CHECK-LD %s
119+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-NO-LIBS %s
120+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-NO-LIBS %s
121+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib -pthread -fjmc -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-NO-CRT,CHECK-NO-LIBS %s
122122

123-
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -### 2>&1 | FileCheck "--implicit-check-not=\"-lc_stub_weak\"" --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-DYNAMIC-CORE-LIBS %s
124-
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -shared -### 2>&1 | FileCheck "--implicit-check-not=\"-lc_stub_weak\"" --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-DYNAMIC-CORE-LIBS %s
125-
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -static -### 2>&1 | FileCheck "--implicit-check-not=\"-lc\"" --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-STATIC-LIBCPP,CHECK-STATIC-CORE-LIBS %s
123+
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-NO-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
124+
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-NO-LIBC,CHECK-DYNAMIC-CORE-LIBS %s
125+
// RUN: %clang --target=x86_64-sie-ps5 %s -nolibc -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-STATIC-LIBCPP,CHECK-NO-LIBC,CHECK-STATIC-CORE-LIBS %s
126126

127-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -### 2>&1 | FileCheck "--implicit-check-not=\"-lc_stub_weak\"" --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-DYNAMIC-CORE-LIBS %s
128-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -shared -### 2>&1 | FileCheck "--implicit-check-not=\"-lc_stub_weak\"" --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-DYNAMIC-CORE-LIBS %s
129-
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -static -### 2>&1 | FileCheck "--implicit-check-not=\"-lstdc++\"" --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-STATIC-LIBC,CHECK-STATIC-CORE-LIBS %s
127+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-MAIN-CRT,CHECK-NO-LIBCPP,CHECK-DYNAMIC-CORE-LIBS %s
128+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -shared -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-SHARED-CRT,CHECK-NO-LIBCPP,CHECK-DYNAMIC-CORE-LIBS %s
129+
// RUN: %clang --target=x86_64-sie-ps5 %s -nostdlib++ -static -### 2>&1 | FileCheck --check-prefixes=CHECK-LD,CHECK-STATIC-CRT,CHECK-NO-LIBCPP,CHECK-STATIC-LIBC,CHECK-STATIC-CORE-LIBS %s
130130

131131
// CHECK-LD: {{ld(\.exe)?}}"
132132
// CHECK-MAIN-CRT-SAME: "crt1.o" "crti.o" "crtbegin.o"
133133
// CHECK-SHARED-CRT-SAME: "crti.o" "crtbeginS.o"
134134
// CHECK-STATIC-CRT-SAME: "crt1.o" "crti.o" "crtbeginT.o"
135135

136+
// CHECK-NO-LIBC-NOT: "-lc{{(_stub_weak)?}}"
137+
// CHECK-NO-LIBCPP-NOT: "-l{{c_stub_weak|stdc\+\+}}"
138+
136139
// CHECK-DYNAMIC-LIBC-SAME: "-lc_stub_weak"
137140
// CHECK-DYNAMIC-CORE-LIBS-SAME: "-lkernel_stub_weak"
138141
// CHECK-STATIC-LIBCPP-SAME: "-lstdc++"
@@ -145,6 +148,9 @@
145148
// CHECK-SHARED-CRT-SAME: "crtendS.o" "crtn.o"
146149
// CHECK-STATIC-CRT-SAME: "crtend.o" "crtn.o"
147150

151+
// CHECK-NO-CRT-NOT: "crt{{[^"]*}}.o"
152+
// CHECK-NO-LIBS-NOT: "-l{{[^"]*}}"
153+
148154
// Test the driver's control over the -fcrash-diagnostics-dir behavior with linker flags.
149155

150156
// RUN: %clang --target=x86_64-sie-ps5 -fcrash-diagnostics-dir=mydumps %s -### 2>&1 | FileCheck --check-prefixes=CHECK-DIAG %s

0 commit comments

Comments
 (0)