Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang/lib/Driver/ToolChains/ZOS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void zos::Assembler::ConstructJob(Compilation &C, const JobAction &JA,

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

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

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

ToolChain::RuntimeLibType ZOS::GetDefaultRuntimeLibType() const {
Expand Down
1 change: 1 addition & 0 deletions clang/test/CodeGenCXX/ubsan-coroutines.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// This test merely verifies that emitting the object file does not cause a
// crash when the LLVM coroutines passes are run.
// RUN: %clang_cc1 -emit-obj -std=c++2a -fsanitize=null %s -o %t.o
// UNSUPPORTED: target={{.*}}-zos{{.*}}

namespace std {
template <typename R, typename... T> struct coroutine_traits {
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/fat-archive-unbundle-ext.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// REQUIRES: x86-registered-target
// UNSUPPORTED: target={{.*-windows.*}}, target={{.*}}-macosx{{.*}}, target={{.*-darwin.*}}, target={{.*}}-aix{{.*}}
// UNSUPPORTED: target={{.*-windows.*}}, target={{.*}}-macosx{{.*}}, target={{.*-darwin.*}}, target={{.*}}-aix{{.*}}, target={{.*}}-zos{{.*}}

// Generate dummy fat object
// RUN: %clang -O0 --target=%itanium_abi_triple %s -c -o %t.host.o
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Headers/cuda_with_openmp.cu
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Reported in https://bugs.llvm.org/show_bug.cgi?id=48014
///==========================================================================///

// REQUIRES: nvptx-registered-target
// REQUIRES: nvptx-registered-target, host-supports-cuda

// 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

15 changes: 11 additions & 4 deletions llvm/test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,17 @@ def host_unwind_supports_jit():
config.available_features.add("unix-sockets")

# .debug_frame is not emitted for targeting Windows x64, aarch64/arm64, AIX, or Apple Silicon Mac.
if not re.match(
r"^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-cygnus|windows-gnu|windows-msvc|aix)",
config.target_triple,
) and not re.match(r"^arm64(e)?-apple-(macos|darwin)", config.target_triple):
if (
not re.match(
r"^(x86_64|aarch64|arm64|powerpc|powerpc64).*-(windows-cygnus|windows-gnu|windows-msvc|aix)",
config.target_triple,
)
and not re.match(
r"^arm64(e)?-apple-(macos|darwin)",
config.target_triple,
)
and not re.match(r".*-zos.*", config.target_triple)
):
config.available_features.add("debug_frame")

if config.enable_backtrace:
Expand Down