Skip to content

Commit 41017af

Browse files
perry-caaokblast
authored andcommitted
bunch of small changes to fix a number of LIT tests on z/OS (llvm#165567)
A collection of small changes to get a number of lit tests working on z/OS.
1 parent 05c0764 commit 41017af

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

clang/lib/Driver/ToolChains/ZOS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void zos::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
7575

7676
const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("as"));
7777
C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
78-
Exec, CmdArgs, Inputs));
78+
Exec, CmdArgs, Inputs, Output));
7979
}
8080

8181
static std::string getLEHLQ(const ArgList &Args) {
@@ -213,7 +213,7 @@ void zos::Linker::ConstructJob(Compilation &C, const JobAction &JA,
213213

214214
const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
215215
C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
216-
Exec, CmdArgs, Inputs));
216+
Exec, CmdArgs, Inputs, Output));
217217
}
218218

219219
ToolChain::RuntimeLibType ZOS::GetDefaultRuntimeLibType() const {

clang/test/CodeGenCXX/ubsan-coroutines.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This test merely verifies that emitting the object file does not cause a
22
// crash when the LLVM coroutines passes are run.
33
// RUN: %clang_cc1 -emit-obj -std=c++2a -fsanitize=null %s -o %t.o
4+
// UNSUPPORTED: target={{.*}}-zos{{.*}}
45

56
namespace std {
67
template <typename R, typename... T> struct coroutine_traits {

clang/test/Driver/fat-archive-unbundle-ext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: x86-registered-target
2-
// UNSUPPORTED: target={{.*-windows.*}}, target={{.*}}-macosx{{.*}}, target={{.*-darwin.*}}, target={{.*}}-aix{{.*}}
2+
// UNSUPPORTED: target={{.*-windows.*}}, target={{.*}}-macosx{{.*}}, target={{.*-darwin.*}}, target={{.*}}-aix{{.*}}, target={{.*}}-zos{{.*}}
33

44
// Generate dummy fat object
55
// RUN: %clang -O0 --target=%itanium_abi_triple %s -c -o %t.host.o

clang/test/Headers/cuda_with_openmp.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Reported in https://bugs.llvm.org/show_bug.cgi?id=48014
33
///==========================================================================///
44

5-
// REQUIRES: nvptx-registered-target
5+
// REQUIRES: nvptx-registered-target, host-supports-cuda
66

77
// RUN: %clang -x cuda -fopenmp -c %s -o - --cuda-path=%S/../Driver/Inputs/CUDA/usr/local/cuda -nocudalib -isystem %S/Inputs/include -isystem %S/../../lib/Headers -fsyntax-only
88

llvm/test/lit.cfg.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,10 +753,17 @@ def host_unwind_supports_jit():
753753
config.available_features.add("unix-sockets")
754754

755755
# .debug_frame is not emitted for targeting Windows x64, aarch64/arm64, AIX, or Apple Silicon Mac.
756-
if not re.match(
757-
r"^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-cygnus|windows-gnu|windows-msvc|aix)",
758-
config.target_triple,
759-
) and not re.match(r"^arm64(e)?-apple-(macos|darwin)", config.target_triple):
756+
if (
757+
not re.match(
758+
r"^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-cygnus|windows-gnu|windows-msvc|aix)",
759+
config.target_triple,
760+
)
761+
and not re.match(
762+
r"^arm64(e)?-apple-(macos|darwin)",
763+
config.target_triple,
764+
)
765+
and not re.match(r".*-zos.*", config.target_triple)
766+
):
760767
config.available_features.add("debug_frame")
761768

762769
if config.enable_backtrace:

0 commit comments

Comments
 (0)