[SystemZ][z/OS] Add required options/macro/etc for z/os compilation step

[SeanP]

Summary

Add the required options and macros to the compilation step for z/os.

[abhina.sreeskantharajan]

The CI shows the following lit tests are failing due to this patch which should be resolved first

Failed Tests (7):

Clang :: CodeGen/SystemZ/zos-alignment.c
Clang :: CodeGen/target-data.c
Clang :: CodeGen/wchar-size.c
Clang :: Driver/zos-comp-cxx.cpp
Clang :: Driver/zos-driver-defaults.c
Clang :: Driver/zos-dwarfversion.c
Clang :: Preprocessor/init-s390x.c

[SeanP]

Removed __ptr32 address space from data layout.

[SeanP]

minor clang-format updates

[abhina.sreeskantharajan]

LGTM, it looks like CI is failing for some unrelated reason, but it would be good to kick it off again

[fanbo-meng]

LGTM

[MaskRay]

clang/include/clang/Driver/Options.td

3707

Drop NoXarchOption. It has a confusing name. It's just to give an error for -Xarch ... which is not relevant here.

clang/test/Driver/zos-comp.c

4

wrap too quickly.

The whole thing can be placed on one line.

9

Use -SAME: whenever applicable

[SeanP]

apply feedback

[SeanP]

Thanks. made these changes.

[SeanP]

Generalize path names in test cases so \\ on windows match.

[SeanP]

Got old diff last time.

[abhina.sreeskantharajan]

new changes LGTM

[SeanP]

fix merge conflicts

clang/include/clang/Driver/Options.td

 def mstack_alignment : Joined<["-"], "mstack-alignment=">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Set the stack alignment">,
   MarshallingInfoInt<CodeGenOpts<"StackAlignment">>;
 def mstack_probe_size : Joined<["-"], "mstack-probe-size=">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Set the stack probe size">,
   MarshallingInfoInt<CodeGenOpts<"StackProbeSize">, "4096">;
 def mstack_arg_probe : Flag<["-"], "mstack-arg-probe">, Group<m_Group>,
   HelpText<"Enable stack probes">;
+def mzos_sys_include_EQ : Joined<["-"], "mzos-sys-include=">, MetaVarName<"<SysInclude>">,
+    HelpText<"Path to system headers on z/OS">;
 def mno_stack_arg_probe : Flag<["-"], "mno-stack-arg-probe">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Disable stack probes which are enabled by default">,
   MarshallingInfoFlag<CodeGenOpts<"NoStackArgProbe">>;
 def mthread_model : Separate<["-"], "mthread-model">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"The thread model to use. Defaults to 'posix')">, Values<"posix,single">,
   NormalizedValues<["POSIX", "Single"]>, NormalizedValuesScope<"LangOptions::ThreadModelKind">,
   MarshallingInfoEnum<LangOpts<"ThreadModel">, "POSIX">;
 def meabi : Separate<["-"], "meabi">, Group<m_Group>, Flags<[CC1Option]>,

clang/lib/Basic/Targets/OSTargets.h

 // z/OS target
 template <typename Target>
 class LLVM_LIBRARY_VISIBILITY ZOSTargetInfo : public OSTargetInfo<Target> {
 protected:
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                     MacroBuilder &Builder) const override {
     // FIXME: _LONG_LONG should not be defined under -std=c89.
     Builder.defineMacro("_LONG_LONG");
-    Builder.defineMacro("_OPEN_DEFAULT");
-    // _UNIX03_WITHDRAWN is required to build libcxx.
-    Builder.defineMacro("_UNIX03_WITHDRAWN");
     Builder.defineMacro("__370__");
     Builder.defineMacro("__BFP__");
     // FIXME: __BOOL__ should not be defined under -std=c89.
     Builder.defineMacro("__BOOL__");
+    Builder.defineMacro("__COMPILER_VER__", "0x50000000");
     Builder.defineMacro("__LONGNAME__");
     Builder.defineMacro("__MVS__");
     Builder.defineMacro("__THW_370__");
     Builder.defineMacro("__THW_BIG_ENDIAN__");
     Builder.defineMacro("__TOS_390__");
     Builder.defineMacro("__TOS_MVS__");
     Builder.defineMacro("__XPLINK__");
 
     if (this->PointerWidth == 64)
       Builder.defineMacro("__64BIT__");
 
-    if (Opts.CPlusPlus) {
-      Builder.defineMacro("__DLL__");
-      // _XOPEN_SOURCE=600 is required to build libcxx.
-      Builder.defineMacro("_XOPEN_SOURCE", "600");
-    }
-
-    if (Opts.GNUMode) {
-      Builder.defineMacro("_MI_BUILTIN");
-      Builder.defineMacro("_EXT");
-    }
-
     if (Opts.CPlusPlus && Opts.WChar) {
       // Macro __wchar_t is defined so that the wchar_t data
       // type is not declared as a typedef in system headers.
       Builder.defineMacro("__wchar_t");
     }
 
     this->PlatformName = llvm::Triple::getOSTypeName(Triple.getOS());
   }
 
 public:
   ZOSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : OSTargetInfo<Target>(Triple, Opts) {
     this->WCharType = TargetInfo::UnsignedInt;
     this->MaxAlignedAttribute = 128;
     this->UseBitFieldTypeAlignment = false;
     this->UseZeroLengthBitfieldAlignment = true;
     this->UseLeadingZeroLengthBitfield = false;
     this->ZeroLengthBitfieldBoundary = 32;
+    this->TheCXXABI.set(TargetCXXABI::XL);
   }
 
   bool areDefaultedSMFStillPOD(const LangOptions &) const override {
     return false;
   }
 };
 
 void addWindowsDefines(const llvm::Triple &Triple, const LangOptions &Opts,

clang/lib/Basic/Targets/SystemZ.h

class LLVM_LIBRARY_VISIBILITY SystemZTargetInfo : public TargetInfo {
   bool SoftFloat;
 
 public:
   SystemZTargetInfo(const llvm::Triple &Triple, const TargetOptions &)
       : TargetInfo(Triple), CPU("z10"), ISARevision(8),
         HasTransactionalExecution(false), HasVector(false), SoftFloat(false) {
     IntMaxType = SignedLong;
     Int64Type = SignedLong;
-    TLSSupported = true;
     IntWidth = IntAlign = 32;
     LongWidth = LongLongWidth = LongAlign = LongLongAlign = 64;
     Int128Align = 64;
     PointerWidth = PointerAlign = 64;
     LongDoubleWidth = 128;
     LongDoubleAlign = 64;
     LongDoubleFormat = &llvm::APFloat::IEEEquad();
     DefaultAlignForAttributeAligned = 64;
     MinGlobalAlign = 16;
     if (Triple.isOSzOS()) {
+      TLSSupported = false;
       // All vector types are default aligned on an 8-byte boundary, even if the
       // vector facility is not available. That is different from Linux.
       MaxVectorAlign = 64;
-      // Compared to Linux/ELF, the data layout differs only in that name
-      // mangling is GOFF.
-      resetDataLayout(
-          "E-m:l-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64");
-    } else
+      // Compared to Linux/ELF, the data layout differs only in some details:
+      // - name mangling is GOFF.
+      // - 32 bit pointers, either as default or special address space
+      resetDataLayout("E-m:l-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-"
+                      "a:8:16-n32:64");
+    } else {
+      TLSSupported = true;
       resetDataLayout("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64"
                       "-v128:64-a:8:16-n32:64");
+    }
     MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;
     HasStrictFP = true;
   }
 
   void getTargetDefines(const LangOptions &Opts,
                         MacroBuilder &Builder) const override;
 
   ArrayRef<Builtin::Info> getTargetBuiltins() const override;

clang/lib/Driver/ToolChains/Clang.cpp

if (A->getOption().matches(options::OPT_fshort_wchar)) {
       bool IsARM = T.isARM() || T.isThumb() || T.isAArch64();
       CmdArgs.push_back("-fwchar-type=int");
       if (T.isOSzOS() ||
           (IsARM && !(T.isOSWindows() || T.isOSNetBSD() || T.isOSOpenBSD())))
         CmdArgs.push_back("-fno-signed-wchar");
       else
         CmdArgs.push_back("-fsigned-wchar");
     }
-  }
+  } else if (T.isOSzOS())
+    CmdArgs.push_back("-fno-signed-wchar");
 }
 
 static void RenderObjCOptions(const ToolChain &TC, const Driver &D,
                               const llvm::Triple &T, const ArgList &Args,
                               ObjCRuntime &Runtime, bool InferCovariantReturns,
                               const InputInfo &Input, ArgStringList &CmdArgs) {
   const llvm::Triple::ArchType Arch = TC.getArch();
 
else if (Value & (Value - 1))
       TC.getDriver().Diag(diag::err_drv_alignment_not_power_of_two)
           << A->getAsString(Args) << A->getValue();
     // Treat =0 as unspecified (use the target preference).
     if (Value)
       CmdArgs.push_back(Args.MakeArgString("-falign-loops=" +
                                            Twine(std::min(Value, 65536u))));
   }
 
+  if (Triple.isOSzOS()) {
+    // On z/OS some of the system header feature macros need to
+    // be defined to enable most cross platform projects to build
+    // successfully.  Ths include the libc++ library.  A
+    // complicating factor is that users can define these
+    // macros to the same or different values.  We need to add
+    // the definition for these macros to the compilation command
+    // if the user hasn't already defined them.
+
+    auto findMacroDefinition = [&](const std::string &Macro) {
+      auto MacroDefs = Args.getAllArgValues(options::OPT_D);
+      return std::find_if(MacroDefs.begin(), MacroDefs.end(),
+                          [&](const std::string &M) {
+                            return M == Macro ||
+                                   M.find(Macro + '=') != std::string::npos;
+                          }) != MacroDefs.end();
+    };
+
+    // _UNIX03_WITHDRAWN is required for libcxx & porting.
+    if (!findMacroDefinition("_UNIX03_WITHDRAWN"))
+      CmdArgs.push_back("-D_UNIX03_WITHDRAWN");
+    // _OPEN_DEFAULT is required for XL compat
+    if (!findMacroDefinition("_OPEN_DEFAULT"))
+      CmdArgs.push_back("-D_OPEN_DEFAULT");
+    if (D.CCCIsCXX() || types::isCXX(Input.getType())) {
+      // _XOPEN_SOURCE=600 is required for libcxx.
+      if (!findMacroDefinition("_XOPEN_SOURCE"))
+        CmdArgs.push_back("-D_XOPEN_SOURCE=600");
+    }
+  }
+
   llvm::Reloc::Model RelocationModel;
   unsigned PICLevel;
   bool IsPIE;
   std::tie(RelocationModel, PICLevel, IsPIE) = ParsePICArgs(TC, Args);
   Arg *LastPICDataRelArg =
       Args.getLastArg(options::OPT_mno_pic_data_is_text_relative,
                       options::OPT_mpic_data_is_text_relative);
   bool NoPICDataIsTextRelative = false;

clang/lib/Driver/ToolChains/ZOS.h

public:
   bool isPICDefault() const override { return false; }
   bool isPIEDefault(const llvm::opt::ArgList &Args) const override {
     return false;
   }
   bool isPICDefaultForced() const override { return false; }
 
   bool IsIntegratedAssemblerDefault() const override { return true; }
 
+  void TryAddIncludeFromPath(llvm::SmallString<128> Path,
+                             const llvm::opt::ArgList &DriverArgs,
+                             llvm::opt::ArgStringList &CC1Args) const;
+  void
+  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+                            llvm::opt::ArgStringList &CC1Args) const override;
+
+  void AddClangCXXStdlibIncludeArgs(
+      const llvm::opt::ArgList &DriverArgs,
+      llvm::opt::ArgStringList &CC1Args) const override;
+
   unsigned GetDefaultDwarfVersion() const override { return 4; }
+  CXXStdlibType GetDefaultCXXStdlibType() const override;
 
   void addClangTargetOptions(
       const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args,
       Action::OffloadKind DeviceOffloadingKind) const override;
 };
 
 } // end namespace toolchains
 } // end namespace driver
 } // end namespace clang
 
 #endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_ZOS_H

clang/lib/Driver/ToolChains/ZOS.cpp

 //===--- ZOS.cpp - z/OS ToolChain Implementations ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "ZOS.h"
 #include "CommonArgs.h"
 #include "clang/Driver/Compilation.h"
 #include "clang/Driver/Options.h"
 #include "llvm/Option/ArgList.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/VirtualFileSystem.h"
+#include "llvm/Support/WithColor.h"
 
+using namespace clang;
 using namespace clang::driver;
 using namespace clang::driver::toolchains;
+using namespace llvm;
 using namespace llvm::opt;
-using namespace clang;
+using namespace llvm::sys;
 
 ZOS::ZOS(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
     : ToolChain(D, Triple, Args) {}
 
 ZOS::~ZOS() {}
 
+ToolChain::CXXStdlibType ZOS::GetDefaultCXXStdlibType() const {
+  return ToolChain::CST_Libcxx;
+}
+
 void ZOS::addClangTargetOptions(const ArgList &DriverArgs,
                                 ArgStringList &CC1Args,
                                 Action::OffloadKind DeviceOffloadKind) const {
   // Pass "-faligned-alloc-unavailable" only when the user hasn't manually
   // enabled or disabled aligned allocations.
   if (!DriverArgs.hasArgNoClaim(options::OPT_faligned_allocation,
                                 options::OPT_fno_aligned_allocation))
     CC1Args.push_back("-faligned-alloc-unavailable");
 }
+
+void ZOS::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+                                    ArgStringList &CC1Args) const {
+  if (DriverArgs.hasArg(options::OPT_nostdinc))
+    return;
+
+  const Driver &D = getDriver();
+
+  // resolve ResourceDir
+  std::string ResourceDir(D.ResourceDir);
+
+  // zos_wrappers must take highest precedence
+
+  // - <clang>/lib/clang/<ver>/include/zos_wrappers
+  if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+    SmallString<128> P(ResourceDir);
+    path::append(P, "include", "zos_wrappers");
+    addSystemInclude(DriverArgs, CC1Args, P.str());
+
+    // - <clang>/lib/clang/<ver>/include
+    SmallString<128> P2(ResourceDir);
+    path::append(P2, "include");
+    addSystemInclude(DriverArgs, CC1Args, P2.str());
+  }
+
+  // - /usr/include
+  if (Arg *SysIncludeArg =
+          DriverArgs.getLastArg(options::OPT_mzos_sys_include_EQ)) {
+    StringRef SysInclude = SysIncludeArg->getValue();
+
+    // fall back to the default include path
+    if (!SysInclude.empty()) {
+
+      // -mzos-sys-include opton can have colon separated
+      // list of paths, so we need to parse the value.
+      StringRef PathLE(SysInclude);
+      size_t Colon = PathLE.find(':');
+      if (Colon == StringRef::npos) {
+        addSystemInclude(DriverArgs, CC1Args, PathLE.str());
+        return;
+      }
+
+      while (Colon != StringRef::npos) {
+        SmallString<128> P = PathLE.substr(0, Colon);
+        addSystemInclude(DriverArgs, CC1Args, P.str());
+        PathLE = PathLE.substr(Colon + 1);
+        Colon = PathLE.find(':');
+      }
+      if (PathLE.size())
+        addSystemInclude(DriverArgs, CC1Args, PathLE.str());
+
+      return;
+    }
+  }
+
+  addSystemInclude(DriverArgs, CC1Args, "/usr/include");
+}
+
+void ZOS::TryAddIncludeFromPath(llvm::SmallString<128> Path,
+                                const llvm::opt::ArgList &DriverArgs,
+                                llvm::opt::ArgStringList &CC1Args) const {
+  if (!getVFS().exists(Path)) {
+    if (DriverArgs.hasArg(options::OPT_v))
+      WithColor::warning(errs(), "Clang")
+          << "ignoring nonexistent directory \"" << Path << "\"\n";
+    if (!DriverArgs.hasArg(options::OPT__HASH_HASH_HASH))
+      return;
+  }
+  addSystemInclude(DriverArgs, CC1Args, Path);
+}
+
+void ZOS::AddClangCXXStdlibIncludeArgs(
+    const llvm::opt::ArgList &DriverArgs,
+    llvm::opt::ArgStringList &CC1Args) const {
+  if (DriverArgs.hasArg(options::OPT_nostdinc) ||
+      DriverArgs.hasArg(options::OPT_nostdincxx) ||
+      DriverArgs.hasArg(options::OPT_nostdlibinc))
+    return;
+
+  switch (GetCXXStdlibType(DriverArgs)) {
+  case ToolChain::CST_Libcxx: {
+    // <install>/bin/../include/c++/v1
+    llvm::SmallString<128> InstallBin =
+        llvm::StringRef(getDriver().getInstalledDir());
+    llvm::sys::path::append(InstallBin, "..", "include", "c++", "v1");
+    TryAddIncludeFromPath(InstallBin, DriverArgs, CC1Args);
+    break;
+  }
+  case ToolChain::CST_Libstdcxx:
+    llvm::report_fatal_error(
+        "picking up libstdc++ headers is unimplemented on z/OS");
+    break;
+  }
+}

clang/test/Driver/zos-comp-cxx.cpp

+// Tests that the z/OS toolchain adds system includes to its search path.
+
+// RUN: %clangxx -c -### %s --target=s390x-ibm-zos 2>&1 \
+// RUN:   | FileCheck %s
+
+// CHECK: "-D_UNIX03_WITHDRAWN"
+// CHECK-SAME: "-D_OPEN_DEFAULT"
+// CHECK-SAME: "-D_XOPEN_SOURCE=600"
+// CHECK-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK-SAME: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK-SAME: "-internal-isystem" "/usr/include"
+// CHECK-SAME: "-fshort-enums"
+// CHECK-SAME: "-fno-signed-char"
+// CHECK-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -mzos-sys-include=/ABC/DEF %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK2 %s
+
+// CHECK2: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK2-SAME: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK2-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK2-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK2-SAME: "-internal-isystem" "{{/|\\\\}}ABC{{/|\\\\}}DEF"
+// CHECK2-NOT: "-internal-isystem" "/usr/include"
+// CHECK2-SAME: "-fshort-enums"
+// CHECK2-SAME: "-fno-signed-char"
+// CHECK2-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -nostdinc %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK3 %s
+
+// CHECK3: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK3-NOT: "-internal-isystem" "{{.*}}/bin/../include/c++/v1"
+// CHECK3-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK3-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK3-NOT: "-internal-isystem" "/usr/include"
+// CHECK3-SAME: "-fshort-enums"
+// CHECK3-SAME: "-fno-signed-char"
+// CHECK3-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -nostdinc++ %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK4 %s
+
+// CHECK4: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK4-NOT: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK4-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK4-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK4-SAME: "-internal-isystem" "/usr/include"
+// CHECK4-SAME: "-fshort-enums"
+// CHECK4-SAME: "-fno-signed-char"
+// CHECK4-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -nostdlibinc %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK5 %s
+
+// CHECK5: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK5-NOT: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK5-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK5-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK5-SAME: "-internal-isystem" "/usr/include"
+// CHECK5-SAME: "-fshort-enums"
+// CHECK5-SAME: "-fno-signed-char"
+// CHECK5-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -nobuiltininc %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK6 %s
+
+// CHECK6: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK6-SAME: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK6-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK6-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK6-SAME: "-internal-isystem" "/usr/include"
+// CHECK6-SAME: "-fshort-enums"
+// CHECK6-SAME: "-fno-signed-char"
+// CHECK6-SAME: "-fno-signed-wchar"
+
+// RUN: %clangxx -c -### -D_XOPEN_SOURCE=700 %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK7 %s
+
+// CHECK7: "-D_UNIX03_WITHDRAWN"
+// CHECK7-SAME: "-D_OPEN_DEFAULT"
+// CHECK7-NOT: "-D_XOPEN_SOURCE=600"
+// CHECK7-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK7-SAME: "-D" "_XOPEN_SOURCE=700"
+// CHECK7-SAME: "-internal-isystem" "{{.*}}{{/|\\\\}}bin{{/|\\\\}}..{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1"
+// CHECK7-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK7-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK7-SAME: "-internal-isystem" "/usr/include"
+// CHECK7-SAME: "-fshort-enums"
+// CHECK7-SAME: "-fno-signed-char"
+// CHECK7-SAME: "-fno-signed-wchar"

clang/test/Driver/zos-comp.c

+// Tests that the z/OS toolchain adds system includes to its search path.
+
+// RUN: %clang -c -### %s --target=s390x-ibm-zos 2>&1 \
+// RUN:   | FileCheck %s
+
+// CHECK: "-D_UNIX03_WITHDRAWN"
+// CHECK-SAME: "-D_OPEN_DEFAULT"
+// CHECK-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK-SAME: "-internal-isystem" "/usr/include"
+// CHECK-SAME: "-fshort-enums"
+// CHECK-SAME: "-fno-signed-char"
+// CHECK-SAME: "-fno-signed-wchar"
+
+// RUN: %clang -c -### -mzos-sys-include=/ABC/DEF %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK2 %s
+
+// CHECK2: "-D_UNIX03_WITHDRAWN"
+// CHECK2-SAME: "-D_OPEN_DEFAULT"
+// CHECK2-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK2-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK2-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK2-SAME: "-internal-isystem" "/ABC/DEF"
+// CHECK2-NOT: "-internal-isystem" "/usr/include"
+// CHECK2-SAME: "-fshort-enums"
+// CHECK2-SAME: "-fno-signed-char"
+// CHECK2-SAME: "-fno-signed-wchar"
+
+// RUN: %clang -c -### -mzos-sys-include=/ABC/DEF:/ghi/jkl %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK3 %s
+
+// CHECK3: "-D_UNIX03_WITHDRAWN"
+// CHECK3-SAME: "-D_OPEN_DEFAULT"
+// CHECK3-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK3-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK3-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK3-SAME: "-internal-isystem" "/ABC/DEF"
+// CHECK3-SAME: "-internal-isystem" "/ghi/jkl"
+// CHECK3-NOT: "-internal-isystem" "/usr/include"
+// CHECK3-SAME: "-fshort-enums"
+// CHECK3-SAME: "-fno-signed-char"
+// CHECK3-SAME: "-fno-signed-wchar"
+
+// RUN: %clang -c -### -nostdinc %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK4 %s
+
+// CHECK4: "-D_UNIX03_WITHDRAWN"
+// CHECK4-SAME: "-D_OPEN_DEFAULT"
+// CHECK4-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK4-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK4-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK4-NOT: "-internal-isystem" "/usr/include"
+// CHECK4-SAME: "-fshort-enums"
+// CHECK4-SAME: "-fno-signed-char"
+// CHECK4-SAME: "-fno-signed-wchar"
+
+
+// RUN: %clang -c -### -nobuiltininc %s 2>&1 \
+// RUN:   --target=s390x-ibm-zos \
+// RUN:   | FileCheck --check-prefixes=CHECK5 %s
+
+// CHECK5: "-D_UNIX03_WITHDRAWN"
+// CHECK5-SAME: "-D_OPEN_DEFAULT"
+// CHECK5-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+// CHECK5-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+// CHECK5-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+// CHECK5-SAME: "-internal-isystem" "/usr/include"
+// CHECK5-SAME: "-fshort-enums"
+// CHECK5-SAME: "-fno-signed-char"
+// CHECK5-SAME: "-fno-signed-wchar"
+

clang/test/Driver/zos-driver-defaults.c

-// RUN: %clang -### --target=s390x-none-zos -fsyntax-only %s 2>&1 | FileCheck --check-prefix=CHECK-SHORT-ENUMS %s
+// RUN: %clang -### --target=s390x-none-zos -fsyntax-only %s 2>&1 | FileCheck --check-prefixes=CHECK-C-MACRO,CHECK-SHORT-ENUMS %s
+// RUN: %clang -### --target=s390x-none-zos -fsyntax-only %s 2>&1 | FileCheck --check-prefix=CHECK-ZOS-INCLUDES %s
 // RUN: %clang -### --target=s390x-none-zos -fno-short-enums -fsyntax-only %s 2>&1 | FileCheck %s
+// RUN: %clangxx -### --target=s390x-none-zos -fsyntax-only %s 2>&1 | FileCheck --check-prefixes=CHECK-C-MACRO,CHECK-CXX-MACRO %s
+// RUN: %clang -### --target=s390x-none-zos -x c++ -fsyntax-only %s 2>&1 | FileCheck --check-prefixes=CHECK-C-MACRO,CHECK-CXX-MACRO %s
+
+//CHECK-C-MACRO: -D_UNIX03_WITHDRAWN
+//CHECK-C-MACRO: -D_OPEN_DEFAULT
+
+//CHECK-CXX-MACRO: -D_XOPEN_SOURCE=600
+//CHECK-USER-CXX-MACRO-NOT: -D_XOPEN_SOURCE=600
+//CHECK-USER-CXX-MACRO: "-D" "_XOPEN_SOURCE=700"
 
 //CHECK-SHORT-ENUMS: -fshort-enums
 //CHECK-SHORT-ENUMS: -fno-signed-char
 
+//CHECK-ZOS-INCLUDES: clang{{.*}} "-cc1" "-triple" "s390x-none-zos"
+//CHECK-ZOS-INCLUDES-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+//CHECK-ZOS-INCLUDES-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include{{(/|\\\\)}}zos_wrappers"
+//CHECK-ZOS-INCLUDES-SAME: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
+//
 //CHECK-NOT: -fshort-enums
 //CHECK: -fno-signed-char

clang/test/Preprocessor/init-s390x.c

 // S390X:#define __WINT_TYPE__ int
 // S390X:#define __WINT_WIDTH__ 32
 // S390X:#define __s390__ 1
 // S390X:#define __s390x__ 1
 
 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=s390x-none-zos -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix S390X-ZOS %s
 // RUN: %clang_cc1 -x c++ -std=gnu++14 -E -dM -ffreestanding -triple=s390x-none-zos -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix S390X-ZOS -check-prefix S390X-ZOS-GNUXX %s
 
-// S390X-ZOS-GNUXX: #define _EXT 1
 // S390X-ZOS:       #define _LONG_LONG 1
-// S390X-ZOS-GNUXX: #define _MI_BUILTIN 1
-// S390X-ZOS:       #define _OPEN_DEFAULT 1
-// S390X-ZOS:       #define _UNIX03_WITHDRAWN 1
-// S390X-ZOS-GNUXX: #define _XOPEN_SOURCE 600
 // S390X-ZOS:       #define __370__ 1
 // S390X-ZOS:       #define __64BIT__ 1
 // S390X-ZOS:       #define __BFP__ 1
 // S390X-ZOS:       #define __BOOL__ 1
-// S390X-ZOS-GNUXX: #define __DLL__ 1
+// S390X-ZOS:       #define __COMPILER_VER__ 0x50000000
 // S390X-ZOS:       #define __LONGNAME__ 1
 // S390X-ZOS:       #define __MVS__ 1
 // S390X-ZOS:       #define __THW_370__ 1
 // S390X-ZOS:       #define __THW_BIG_ENDIAN__ 1
 // S390X-ZOS:       #define __TOS_390__ 1
 // S390X-ZOS:       #define __TOS_MVS__ 1
 // S390X-ZOS:       #define __XPLINK__ 1
 // S390X-ZOS-GNUXX: #define __wchar_t 1