From 00a91779d64fe10bf2ba30253b8a4d268ae7226a Mon Sep 17 00:00:00 2001 From: Sean Silva Date: Wed, 14 Oct 2015 06:45:07 +0000 Subject: [PATCH] Revert-to-green r250262 (PS4 toolchain patch) It is breaking llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast e.g. http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/1362 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@250273 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticDriverKinds.td | 14 - include/clang/Basic/DiagnosticGroups.td | 4 - lib/Driver/Driver.cpp | 3 - lib/Driver/ToolChains.cpp | 74 ---- lib/Driver/ToolChains.h | 21 -- lib/Driver/Tools.cpp | 348 +----------------- lib/Driver/Tools.h | 30 -- lib/Frontend/InitHeaderSearch.cpp | 23 -- .../Inputs/scei-ps4_tree/target/include/.keep | 0 .../scei-ps4_tree/target/include_common/.keep | 0 test/Driver/debug-options.c | 14 - test/Driver/no-integrated-as.s | 8 - test/Driver/ps4-header-search.c | 10 - test/Driver/ps4-linker-non-win.c | 18 - test/Driver/ps4-linker-win.c | 26 -- test/Driver/ps4-pic.c | 106 ------ test/Driver/ps4-sdk-root.c | 48 --- test/Driver/stack-protector.c | 9 - 18 files changed, 7 insertions(+), 749 deletions(-) delete mode 100644 test/Driver/Inputs/scei-ps4_tree/target/include/.keep delete mode 100644 test/Driver/Inputs/scei-ps4_tree/target/include_common/.keep delete mode 100644 test/Driver/no-integrated-as.s delete mode 100644 test/Driver/ps4-header-search.c delete mode 100644 test/Driver/ps4-linker-non-win.c delete mode 100644 test/Driver/ps4-linker-win.c delete mode 100644 test/Driver/ps4-pic.c delete mode 100644 test/Driver/ps4-sdk-root.c diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td index 6d8187b2c0..beaefde8fc 100644 --- a/include/clang/Basic/DiagnosticDriverKinds.td +++ b/include/clang/Basic/DiagnosticDriverKinds.td @@ -196,18 +196,4 @@ def warn_target_unsupported_nan2008 : Warning< def warn_target_unsupported_nanlegacy : Warning< "ignoring '-mnan=legacy' option because the '%0' architecture does not support it">, InGroup; - -def warn_drv_unable_to_find_directory_expected : Warning< - "unable to find %0 directory, expected to be in '%1'">, - InGroup, DefaultIgnore; - -def warn_drv_ps4_force_pic : Warning< - "option '%0' was ignored by the PS4 toolchain, using '-fPIC'">, - InGroup; - -def warn_drv_ps4_sdk_dir : Warning< - "environment variable SCE_PS4_SDK_DIR is set, but points to invalid or nonexistent directory '%0'">, - InGroup; - -def err_drv_unsupported_linker : Error<"unsupported value '%0' for -linker option">; } diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 97c897f840..39ed1318cd 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -823,7 +823,3 @@ def CudaCompat : DiagGroup<"cuda-compat">; // A warning group for things that will change semantics in the future. def FutureCompat : DiagGroup<"future-compat">; - -def InvalidOrNonExistentDirectory : DiagGroup<"invalid-or-nonexistent-directory">; - -def OptionIgnored : DiagGroup<"option-ignored">; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 0b842cd617..dc95ed2e9c 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -2261,9 +2261,6 @@ const ToolChain &Driver::getToolChain(const ArgList &Args, case llvm::Triple::CUDA: TC = new toolchains::CudaToolChain(*this, Target, Args); break; - case llvm::Triple::PS4: - TC = new toolchains::PS4CPU(*this, Target, Args); - break; default: // Of these targets, Hexagon is the only one that might have // an OS of Linux, in which case it got handled above already. diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index d35a40ff8f..24ea030b9c 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -4066,77 +4066,3 @@ void WebAssembly::addClangTargetOptions(const ArgList &DriverArgs, options::OPT_fno_use_init_array, true)) CC1Args.push_back("-fuse-init-array"); } - -PS4CPU::PS4CPU(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - : Generic_ELF(D, Triple, Args) { - if (Args.hasArg(options::OPT_static)) - D.Diag(diag::err_drv_unsupported_opt_for_target) << "-static" << "PS4"; - - // Determine where to find the PS4 libraries. We use SCE_PS4_SDK_DIR - // if it exists; otherwise use the driver's installation path, which - // should be /host_tools/bin. - - SmallString<512> PS4SDKDir; - if (const char *EnvValue = getenv("SCE_PS4_SDK_DIR")) { - if (!llvm::sys::fs::exists(EnvValue)) - getDriver().Diag(clang::diag::warn_drv_ps4_sdk_dir) << EnvValue; - PS4SDKDir = EnvValue; - } else { - PS4SDKDir = getDriver().Dir; - llvm::sys::path::append(PS4SDKDir, "/../../"); - } - - // By default, the driver won't report a warning if it can't find - // PS4's include or lib directories. This behavior could be changed if - // -Weverything or -Winvalid-or-nonexistent-directory options are passed. - // If -isysroot was passed, use that as the SDK base path. - std::string PrefixDir; - if (const Arg *A = Args.getLastArg(options::OPT_isysroot)) { - PrefixDir = A->getValue(); - if (!llvm::sys::fs::exists(PrefixDir)) - getDriver().Diag(clang::diag::warn_missing_sysroot) << PrefixDir; - } else - PrefixDir = PS4SDKDir.str(); - - SmallString<512> PS4SDKIncludeDir(PrefixDir); - llvm::sys::path::append(PS4SDKIncludeDir, "target/include"); - if (!Args.hasArg(options::OPT_nostdinc) && - !Args.hasArg(options::OPT_nostdlibinc) && - !Args.hasArg(options::OPT_isysroot) && - !Args.hasArg(options::OPT__sysroot_EQ) && - !llvm::sys::fs::exists(PS4SDKIncludeDir)) { - getDriver().Diag(clang::diag::warn_drv_unable_to_find_directory_expected) - << "PS4 system headers" << PS4SDKIncludeDir; - } - - SmallString<512> PS4SDKLibDir(PS4SDKDir); - llvm::sys::path::append(PS4SDKLibDir, "target/lib"); - if (!Args.hasArg(options::OPT_nostdlib) && - !Args.hasArg(options::OPT_nodefaultlibs) && - !Args.hasArg(options::OPT__sysroot_EQ) && !Args.hasArg(options::OPT_E) && - !Args.hasArg(options::OPT_c) && !Args.hasArg(options::OPT_S) && - !Args.hasArg(options::OPT_emit_ast) && - !llvm::sys::fs::exists(PS4SDKLibDir)) { - getDriver().Diag(clang::diag::warn_drv_unable_to_find_directory_expected) - << "PS4 system libraries" << PS4SDKLibDir; - return; - } - getFilePaths().push_back(PS4SDKLibDir.str()); -} - -Tool *PS4CPU::buildAssembler() const { - return new tools::PS4cpu::Assemble(*this); -} - -Tool *PS4CPU::buildLinker() const { return new tools::PS4cpu::Link(*this); } - -bool PS4CPU::isPICDefault() const { return true; } - -bool PS4CPU::HasNativeLLVMSupport() const { return true; } - -SanitizerMask PS4CPU::getSupportedSanitizers() const { - SanitizerMask Res = ToolChain::getSupportedSanitizers(); - Res |= SanitizerKind::Address; - Res |= SanitizerKind::Vptr; - return Res; -} diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 17a3b64165..58b417c970 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -1015,27 +1015,6 @@ private: llvm::opt::ArgStringList &CC1Args) const override; }; -class LLVM_LIBRARY_VISIBILITY PS4CPU : public Generic_ELF { -public: - PS4CPU(const Driver &D, const llvm::Triple &Triple, - const llvm::opt::ArgList &Args); - - bool IsMathErrnoDefault() const override { return false; } - bool IsObjCNonFragileABIDefault() const override { return true; } - bool HasNativeLLVMSupport() const override; - bool isPICDefault() const override; - - unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override { - return 2; // SSPStrong - } - - SanitizerMask getSupportedSanitizers() const override; - -protected: - Tool *buildAssembler() const override; - Tool *buildLinker() const override; -}; - } // end namespace toolchains } // end namespace driver } // end namespace clang diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 21939e011f..8a8904dd81 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -3110,23 +3110,15 @@ ParsePICArgs(const ToolChain &ToolChain, const llvm::Triple &Triple, O.matches(options::OPT_fPIE) || O.matches(options::OPT_fPIC); } else { PIE = PIC = false; - if (Triple.isPS4CPU()) { - Arg *ModelArg = Args.getLastArg(options::OPT_mcmodel_EQ); - StringRef Model = ModelArg ? ModelArg->getValue() : ""; - if (Model != "kernel") { - PIC = true; - ToolChain.getDriver().Diag(diag::warn_drv_ps4_force_pic) - << LastPICArg->getSpelling(); - } - } } } } - // Introduce a Darwin and PS4-specific hack. If the default is PIC, but the - // PIC level would've been set to level 1, force it back to level 2 PIC - // instead. - if (PIC && (ToolChain.getTriple().isOSDarwin() || Triple.isPS4CPU())) + // Introduce a Darwin-specific hack. If the default is PIC, but the + // PIC level would've been set to level 1, force it back to level 2 + // PIC instead. This matches the behavior of Darwin GCC (based on + // chandlerc's informal testing in 2012). + if (PIC && ToolChain.getTriple().isOSDarwin()) IsPICLevelTwo |= ToolChain.isPICDefault(); // This kernel flags are a trump-card: they will disable PIC/PIE @@ -3198,7 +3190,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, bool IsWindowsCygnus = getToolChain().getTriple().isWindowsCygwinEnvironment(); bool IsWindowsMSVC = getToolChain().getTriple().isWindowsMSVCEnvironment(); - bool IsPS4CPU = getToolChain().getTriple().isPS4CPU(); // Check number of inputs for sanity. We need at least one input. assert(Inputs.size() >= 1 && "Must have at least one input."); @@ -3852,10 +3843,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // We ignore flags -gstrict-dwarf and -grecord-gcc-switches for now. Args.ClaimAllArgs(options::OPT_g_flags_Group); - - // PS4 defaults to no column info if (Args.hasFlag(options::OPT_gcolumn_info, options::OPT_gno_column_info, - /*Default=*/ !IsPS4CPU)) + /*Default*/ true)) CmdArgs.push_back("-dwarf-column-info"); // FIXME: Move backend command line options to the module. @@ -3894,8 +3883,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // -gdwarf-aranges turns on the emission of the aranges section in the // backend. - // Always enabled on the PS4. - if (Args.hasArg(options::OPT_gdwarf_aranges) || IsPS4CPU) { + if (Args.hasArg(options::OPT_gdwarf_aranges)) { CmdArgs.push_back("-backend-option"); CmdArgs.push_back("-generate-arange-section"); } @@ -9931,325 +9919,3 @@ void tools::Myriad::Linker::ConstructJob(Compilation &C, const JobAction &JA, C.addCommand(llvm::make_unique(JA, *this, Args.MakeArgString(Exec), CmdArgs, Inputs)); } - -void PS4cpu::Assemble::ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) const { - claimNoWarnArgs(Args); - ArgStringList CmdArgs; - - Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, options::OPT_Xassembler); - - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - - assert(Inputs.size() == 1 && "Unexpected number of inputs."); - const InputInfo &Input = Inputs[0]; - assert(Input.isFilename() && "Invalid input."); - CmdArgs.push_back(Input.getFilename()); - - const char *Exec = - Args.MakeArgString(getToolChain().GetProgramPath("ps4-as")); - C.addCommand(llvm::make_unique(JA, *this, Exec, CmdArgs, Inputs)); -} - -static void AddPS4ProfileRT(const ToolChain &TC, const ArgList &Args, - ArgStringList &CmdArgs) { - if (!(Args.hasFlag(options::OPT_fprofile_arcs, options::OPT_fno_profile_arcs, - false) || - Args.hasArg(options::OPT_fprofile_generate) || - Args.hasArg(options::OPT_fprofile_instr_generate) || - Args.hasArg(options::OPT_fcreate_profile) || - Args.hasArg(options::OPT_coverage))) - return; - - assert(TC.getTriple().isPS4CPU() && - "Profiling libraries are only implemented for the PS4 CPU"); - CmdArgs.push_back("-lclang_rt.profile-x86_64"); -} - -static void AddPS4SanitizerArgs(const ToolChain &TC, ArgStringList &CmdArgs) { - const SanitizerArgs &SanArgs = TC.getSanitizerArgs(); - if (SanArgs.needsUbsanRt()) { - CmdArgs.push_back("-lSceDbgUBSanitizer_stub_weak"); - } - if (SanArgs.needsAsanRt()) { - CmdArgs.push_back("-lSceDbgAddressSanitizer_stub_weak"); - } -} - -static void ConstructPS4LinkJob(const Tool &T, Compilation &C, - const JobAction &JA, const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) { - const toolchains::FreeBSD &ToolChain = - static_cast(T.getToolChain()); - const Driver &D = ToolChain.getDriver(); - ArgStringList CmdArgs; - - // Silence warning for "clang -g foo.o -o foo" - Args.ClaimAllArgs(options::OPT_g_Group); - // and "clang -emit-llvm foo.o -o foo" - Args.ClaimAllArgs(options::OPT_emit_llvm); - // and for "clang -w foo.o -o foo". Other warning options are already - // handled somewhere else. - Args.ClaimAllArgs(options::OPT_w); - - if (!D.SysRoot.empty()) - CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot)); - - if (Args.hasArg(options::OPT_pie)) - CmdArgs.push_back("-pie"); - - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); - if (Args.hasArg(options::OPT_shared)) - CmdArgs.push_back("--oformat=so"); - - if (Output.isFilename()) { - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - } else { - assert(Output.isNothing() && "Invalid output."); - } - - Args.AddAllArgs(CmdArgs, options::OPT_L); - Args.AddAllArgs(CmdArgs, options::OPT_T_Group); - Args.AddAllArgs(CmdArgs, options::OPT_e); - Args.AddAllArgs(CmdArgs, options::OPT_s); - Args.AddAllArgs(CmdArgs, options::OPT_t); - Args.AddAllArgs(CmdArgs, options::OPT_r); - - if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) - CmdArgs.push_back("--no-demangle"); - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - - if (Args.hasArg(options::OPT_pthread)) { - CmdArgs.push_back("-lpthread"); - } - - AddPS4ProfileRT(ToolChain, Args, CmdArgs); - AddPS4SanitizerArgs(ToolChain, CmdArgs); - - const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); - - C.addCommand(llvm::make_unique(JA, T, Exec, CmdArgs, Inputs)); -} - -static void ConstructGoldLinkJob(const Tool &T, Compilation &C, - const JobAction &JA, const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) { - const toolchains::FreeBSD &ToolChain = - static_cast(T.getToolChain()); - const Driver &D = ToolChain.getDriver(); - ArgStringList CmdArgs; - - // Silence warning for "clang -g foo.o -o foo" - Args.ClaimAllArgs(options::OPT_g_Group); - // and "clang -emit-llvm foo.o -o foo" - Args.ClaimAllArgs(options::OPT_emit_llvm); - // and for "clang -w foo.o -o foo". Other warning options are already - // handled somewhere else. - Args.ClaimAllArgs(options::OPT_w); - - if (!D.SysRoot.empty()) - CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot)); - - if (Args.hasArg(options::OPT_pie)) - CmdArgs.push_back("-pie"); - - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("-Bstatic"); - } else { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); - CmdArgs.push_back("--eh-frame-hdr"); - if (Args.hasArg(options::OPT_shared)) { - CmdArgs.push_back("-Bshareable"); - } else { - CmdArgs.push_back("-dynamic-linker"); - CmdArgs.push_back("/libexec/ld-elf.so.1"); - } - CmdArgs.push_back("--enable-new-dtags"); - } - - if (Output.isFilename()) { - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - } else { - assert(Output.isNothing() && "Invalid output."); - } - - if (!Args.hasArg(options::OPT_nostdlib) && - !Args.hasArg(options::OPT_nostartfiles)) { - const char *crt1 = NULL; - if (!Args.hasArg(options::OPT_shared)) { - if (Args.hasArg(options::OPT_pg)) - crt1 = "gcrt1.o"; - else if (Args.hasArg(options::OPT_pie)) - crt1 = "Scrt1.o"; - else - crt1 = "crt1.o"; - } - if (crt1) - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crt1))); - - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o"))); - - const char *crtbegin = NULL; - if (Args.hasArg(options::OPT_static)) - crtbegin = "crtbeginT.o"; - else if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie)) - crtbegin = "crtbeginS.o"; - else - crtbegin = "crtbegin.o"; - - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin))); - } - - Args.AddAllArgs(CmdArgs, options::OPT_L); - - const ToolChain::path_list Paths = ToolChain.getFilePaths(); - for (ToolChain::path_list::const_iterator i = Paths.begin(), e = Paths.end(); - i != e; ++i) - CmdArgs.push_back(Args.MakeArgString(StringRef("-L") + *i)); - - Args.AddAllArgs(CmdArgs, options::OPT_T_Group); - Args.AddAllArgs(CmdArgs, options::OPT_e); - Args.AddAllArgs(CmdArgs, options::OPT_s); - Args.AddAllArgs(CmdArgs, options::OPT_t); - Args.AddAllArgs(CmdArgs, options::OPT_r); - - if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) - CmdArgs.push_back("--no-demangle"); - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - - if (!Args.hasArg(options::OPT_nostdlib) && - !Args.hasArg(options::OPT_nodefaultlibs)) { - // For PS4, we always want to pass libm, libstdc++ and libkernel - // libraries for both C and C++ compilations. - CmdArgs.push_back("-lkernel"); - if (D.CCCIsCXX()) { - ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); - if (Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lm_p"); - else - CmdArgs.push_back("-lm"); - } - // FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding - // the default system libraries. Just mimic this for now. - if (Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lgcc_p"); - else - CmdArgs.push_back("-lcompiler_rt"); - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("-lstdc++"); - } else if (Args.hasArg(options::OPT_pg)) { - CmdArgs.push_back("-lgcc_eh_p"); - } else { - CmdArgs.push_back("--as-needed"); - CmdArgs.push_back("-lstdc++"); - CmdArgs.push_back("--no-as-needed"); - } - - if (Args.hasArg(options::OPT_pthread)) { - if (Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lpthread_p"); - else - CmdArgs.push_back("-lpthread"); - } - - if (Args.hasArg(options::OPT_pg)) { - if (Args.hasArg(options::OPT_shared)) - CmdArgs.push_back("-lc"); - else { - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("--start-group"); - CmdArgs.push_back("-lc_p"); - CmdArgs.push_back("-lpthread_p"); - CmdArgs.push_back("--end-group"); - } else { - CmdArgs.push_back("-lc_p"); - } - } - CmdArgs.push_back("-lgcc_p"); - } else { - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("--start-group"); - CmdArgs.push_back("-lc"); - CmdArgs.push_back("-lpthread"); - CmdArgs.push_back("--end-group"); - } else { - CmdArgs.push_back("-lc"); - } - CmdArgs.push_back("-lcompiler_rt"); - } - - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("-lstdc++"); - } else if (Args.hasArg(options::OPT_pg)) { - CmdArgs.push_back("-lgcc_eh_p"); - } else { - CmdArgs.push_back("--as-needed"); - CmdArgs.push_back("-lstdc++"); - CmdArgs.push_back("--no-as-needed"); - } - } - - if (!Args.hasArg(options::OPT_nostdlib) && - !Args.hasArg(options::OPT_nostartfiles)) { - if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie)) - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtendS.o"))); - else - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtend.o"))); - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o"))); - } - - AddPS4ProfileRT(ToolChain, Args, CmdArgs); - AddPS4SanitizerArgs(ToolChain, CmdArgs); - - const char *Exec = -#ifdef LLVM_ON_WIN32 - Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld.gold.exe")); -#else - Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); -#endif - - C.addCommand(llvm::make_unique(JA, T, Exec, CmdArgs, Inputs)); -} - -void PS4cpu::Link::ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) const { - const toolchains::FreeBSD &ToolChain = - static_cast(getToolChain()); - const Driver &D = ToolChain.getDriver(); - bool PS4Linker; - StringRef LinkerOptName; - if (const Arg *A = Args.getLastArg(options::OPT_fuse_ld_EQ)) { - LinkerOptName = A->getValue(); - if (LinkerOptName != "ps4" && LinkerOptName != "gold") - D.Diag(diag::err_drv_unsupported_linker) << LinkerOptName; - } - - if (LinkerOptName == "gold") - PS4Linker = false; - else if (LinkerOptName == "ps4") - PS4Linker = true; - else - PS4Linker = !Args.hasArg(options::OPT_shared); - - if (PS4Linker) - ConstructPS4LinkJob(*this, C, JA, Output, Inputs, Args, LinkingOutput); - else - ConstructGoldLinkJob(*this, C, JA, Output, Inputs, Args, LinkingOutput); -} diff --git a/lib/Driver/Tools.h b/lib/Driver/Tools.h index be306e358f..bc10171d52 100644 --- a/lib/Driver/Tools.h +++ b/lib/Driver/Tools.h @@ -831,36 +831,6 @@ public: }; } // end namespace Myriad -namespace PS4cpu { -class LLVM_LIBRARY_VISIBILITY Assemble : public Tool { -public: - Assemble(const ToolChain &TC) - : Tool("PS4cpu::Assemble", "assembler", TC, RF_Full) {} - - virtual bool hasIntegratedCPP() const { return false; } - - virtual void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const; -}; - -class LLVM_LIBRARY_VISIBILITY Link : public Tool { -public: - Link(const ToolChain &TC) : Tool("PS4cpu::Link", "linker", TC, RF_Full) {} - - virtual bool hasIntegratedCPP() const { return false; } - virtual bool isLinkJob() const { return true; } - - virtual void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const; -}; -} // end namespace PS4cpu - } // end namespace tools } // end namespace driver } // end namespace clang diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 1de46271d1..3c4aed12b1 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -215,7 +215,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, case llvm::Triple::OpenBSD: case llvm::Triple::Bitrig: case llvm::Triple::NaCl: - case llvm::Triple::PS4: break; case llvm::Triple::Win32: if (triple.getEnvironment() != llvm::Triple::Cygnus) @@ -319,28 +318,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, case llvm::Triple::RTEMS: case llvm::Triple::NaCl: break; - case llvm::Triple::PS4: { - // gets prepended later in AddPath(). - std::string BaseSDKPath = ""; - if (!HasSysroot) { - const char *envValue = getenv("SCE_PS4_SDK_DIR"); - if (envValue) - BaseSDKPath = envValue; - else { - // HSOpts.ResourceDir variable contains the location of Clang's - // resource files. - // Assuming that Clang is configured for PS4 without - // --with-clang-resource-dir option, the location of Clang's resource - // files is /host_tools/lib/clang - SmallString<128> P = StringRef(HSOpts.ResourceDir); - llvm::sys::path::append(P, "../../.."); - BaseSDKPath = P.str(); - } - } - AddPath(BaseSDKPath + "/target/include", System, false); - if (triple.isPS4CPU()) - AddPath(BaseSDKPath + "/target/include_common", System, false); - } default: AddPath("/usr/include", ExternCSystem, false); break; diff --git a/test/Driver/Inputs/scei-ps4_tree/target/include/.keep b/test/Driver/Inputs/scei-ps4_tree/target/include/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/Driver/Inputs/scei-ps4_tree/target/include_common/.keep b/test/Driver/Inputs/scei-ps4_tree/target/include_common/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/Driver/debug-options.c b/test/Driver/debug-options.c index 25ccc3ea4a..437e9fcb50 100644 --- a/test/Driver/debug-options.c +++ b/test/Driver/debug-options.c @@ -27,17 +27,6 @@ // RUN: %clang -### -c -ggdb3 %s -target x86_64-apple-darwin 2>&1 \ // RUN: | FileCheck -check-prefix=G_DARWIN %s -// On the PS4, -g defaults to -gno-column-info, and we always generate the -// arange section. -// RUN: %clang -### -c %s -target x86_64-scei-ps4 2>&1 \ -// RUN: | FileCheck -check-prefix=G_PS4 %s -// RUN: %clang -### -c %s -g -target x86_64-scei-ps4 2>&1 \ -// RUN: | FileCheck -check-prefix=G_PS4 %s -// RUN: %clang -### -c %s -g -target x86_64-scei-ps4 2>&1 \ -// RUN: | FileCheck -check-prefix=NOCI %s -// RUN: %clang -### -c %s -g -gcolumn-info -target x86_64-scei-ps4 2>&1 \ -// RUN: | FileCheck -check-prefix=CI %s - // RUN: %clang -### -c -gdwarf-2 %s 2>&1 | FileCheck -check-prefix=G_D2 %s // // RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=G_NO %s @@ -97,9 +86,6 @@ // G_DARWIN: "-cc1" // G_DARWIN: "-dwarf-version=2" // -// G_PS4: "-cc1" -// G_PS4: "-generate-arange-section" -// // G_D2: "-cc1" // G_D2: "-dwarf-version=2" // diff --git a/test/Driver/no-integrated-as.s b/test/Driver/no-integrated-as.s deleted file mode 100644 index cd6f5e2867..0000000000 --- a/test/Driver/no-integrated-as.s +++ /dev/null @@ -1,8 +0,0 @@ -; RUN: %clang -### -no-integrated-as -c %s 2>&1 | FileCheck %s -check-prefix IAS -; Windows doesn't support no-integrated-as -; XFAIL: win32,win64 -; -; Make sure the current file's filename appears in the output. -; We can't generically match on the assembler name, so we just make sure -; the filename is in the output. -; IAS: no-integrated-as.s diff --git a/test/Driver/ps4-header-search.c b/test/Driver/ps4-header-search.c deleted file mode 100644 index 15e093f60e..0000000000 --- a/test/Driver/ps4-header-search.c +++ /dev/null @@ -1,10 +0,0 @@ -// REQUIRES: x86-registered-target - -// RUN: env SCE_PS4_SDK_DIR=%S/Inputs/scei-ps4_tree %clang -target x86_64-scei-ps4 -E -v %s 2>&1 | FileCheck %s --check-prefix=ENVPS4 -// ENVPS4: Inputs/scei-ps4_tree/target/include{{$}} -// ENVPS4: Inputs/scei-ps4_tree/target/include_common{{$}} - -// RUN: %clang -isysroot %S/Inputs/scei-ps4_tree -target x86_64-scei-ps4 -E -v %s 2>&1 | FileCheck %s --check-prefix=SYSROOTPS4 -// SYSROOTPS4: "{{[^"]*}}clang{{[^"]*}}" -// SYSROOTPS4: Inputs/scei-ps4_tree/target/include{{$}} -// SYSROOTPS4: Inputs/scei-ps4_tree/target/include_common{{$}} diff --git a/test/Driver/ps4-linker-non-win.c b/test/Driver/ps4-linker-non-win.c deleted file mode 100644 index 9a89527702..0000000000 --- a/test/Driver/ps4-linker-non-win.c +++ /dev/null @@ -1,18 +0,0 @@ -// UNSUPPORTED: system-windows -// REQUIRES: x86-registered-target - -// RUN: touch %T/ps4-ld - -// RUN: env "PATH=%T" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=gold 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -### -target x86_64-scei-ps4 %s -shared 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s - -// RUN: env "PATH=%T" %clang -### -target x86_64-scei-ps4 %s 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=ps4 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -### -target x86_64-scei-ps4 %s -shared \ -// RUN: -fuse-ld=ps4 2>&1 | FileCheck --check-prefix=CHECK-PS4-LINKER %s - -// CHECK-PS4-LINKER: ps4-ld diff --git a/test/Driver/ps4-linker-win.c b/test/Driver/ps4-linker-win.c deleted file mode 100644 index 1681397b87..0000000000 --- a/test/Driver/ps4-linker-win.c +++ /dev/null @@ -1,26 +0,0 @@ -// The full path to the gold linker was not found on Windows because the -// driver fails to add an .exe extension to the name. -// We check that gold linker's full name (with an extension) is specified -// on the command line if -fuse-ld=gold, or -shared with no -fuse-ld option -// are passed. Otherwise, we check that the PS4's linker's full name is -// specified. - -// REQUIRES: system-windows, x86-registered-target - -// RUN: touch %T/ps4-ld.exe -// RUN: touch %T/ps4-ld.gold.exe - -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s - -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -fuse-ld=ps4 -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -shared \ -// RUN: -fuse-ld=ps4 -### 2>&1 | FileCheck --check-prefix=CHECK-PS4-LINKER %s - -// CHECK-PS4-GOLD: ps4-ld.gold.exe -// CHECK-PS4-LINKER: ps4-ld.exe diff --git a/test/Driver/ps4-pic.c b/test/Driver/ps4-pic.c deleted file mode 100644 index 0cf9ad5f19..0000000000 --- a/test/Driver/ps4-pic.c +++ /dev/null @@ -1,106 +0,0 @@ -// REQUIRES: x86-registered-target - -// Test the driver's control over the PIC behavior for PS4 compiler. -// These consist of tests of the relocation model flags and the -// pic level flags passed to CC1. -// -// CHECK-NO-PIC: "-mrelocation-model" "static" -// CHECK-NO-PIC-NOT: "-pic-level" -// CHECK-NO-PIC-NOT: "-pie-level" -// -// CHECK-DYNAMIC-NO-PIC2: unsupported option '-mdynamic-no-pic' -// CHECK-DYNAMIC-NO-PIC2: "-mrelocation-model" "dynamic-no-pic" -// -// CHECK-PIC2: "-mrelocation-model" "pic" -// CHECK-PIC2: "-pic-level" "2" -// -// CHECK-PIE2: "-mrelocation-model" "pic" -// CHECK-PIE2: "-pie-level" "2" -// -// CHECK-NOPIC-IGNORED: using '-fPIC' -// CHECK-NOPIC-IGNORED: "-mrelocation-model" "pic" -// CHECK-NOPIC-IGNORED: "-pic-level" "2" -// -// CHECK-DIAG-PIC: option '-fno-PIC' was ignored by the PS4 toolchain, using '-fPIC' -// CHECK-DIAG-PIE: option '-fno-PIE' was ignored by the PS4 toolchain, using '-fPIC' -// CHECK-DIAG-pic: option '-fno-pic' was ignored by the PS4 toolchain, using '-fPIC' -// CHECK-DIAG-pie: option '-fno-pie' was ignored by the PS4 toolchain, using '-fPIC' -// -// CHECK-STATIC-ERR: unsupported option '-static' for target 'PS4' - -// RUN: %clang -c %s -target x86_64-scei-ps4 -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIE2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIE2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIC -fno-PIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -fno-PIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIC -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpie -fno-pie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIE -fno-PIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpie -fno-PIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIE -fno-pie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpie -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -fno-pie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -fPIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fPIC -fpic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpic -fPIE -fpie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIE2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fpie -fPIC -fPIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIE2 -// -// Defaults change for PS4. -// RUN: %clang -c %s -target x86_64-scei-ps4 -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-PIC2 -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-PIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NOPIC-IGNORED -// -// Disregard any of the PIC-specific flags if we have a trump-card flag. -// RUN: %clang -c %s -target x86_64-scei-ps4 -mkernel -fPIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NO-PIC -// RUN: %clang -c %s -target x86_64-scei-ps4 -mdynamic-no-pic -fPIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-DYNAMIC-NO-PIC2 -// -// -static not supported at all. -// RUN: %clang -c %s -target x86_64-scei-ps4 -static -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-STATIC-ERR -// -// -fno-PIC etc. is obeyed if -mcmodel=kernel is also present. -// RUN: %clang -c %s -target x86_64-scei-ps4 -mcmodel=kernel -fno-PIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NO-PIC -// RUN: %clang -c %s -target x86_64-scei-ps4 -mcmodel=kernel -fno-PIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NO-PIC -// RUN: %clang -c %s -target x86_64-scei-ps4 -mcmodel=kernel -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NO-PIC -// RUN: %clang -c %s -target x86_64-scei-ps4 -mcmodel=kernel -fno-pie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-NO-PIC -// -// Verify that we reflect the option the user specified, when we ignore it. -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-PIC -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-DIAG-PIC -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-PIE -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-DIAG-PIE -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-pic -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-DIAG-pic -// RUN: %clang -c %s -target x86_64-scei-ps4 -fno-pie -### 2>&1 \ -// RUN: | FileCheck %s --check-prefix=CHECK-DIAG-pie diff --git a/test/Driver/ps4-sdk-root.c b/test/Driver/ps4-sdk-root.c deleted file mode 100644 index f40a963ac9..0000000000 --- a/test/Driver/ps4-sdk-root.c +++ /dev/null @@ -1,48 +0,0 @@ -// REQUIRES: x86-registered-target - -// Check that ps4-clang doesn't report a warning message when locating -// system header files (either by looking at the value of SCE_PS4_SDK_DIR -// or relative to the location of the compiler driver), if "-nostdinc", -// "--sysroot" or "-isysroot" option is specified on the command line. -// Otherwise, check that ps4-clang reports a warning. - -// Check that clang doesn't report a warning message when locating -// system libraries (either by looking at the value of SCE_PS4_SDK_DIR -// or relative to the location of the compiler driver), if "-c", "-S", "-E", -// "--sysroot", "-nostdlib" or "-nodefaultlibs" option is specified on -// the command line. -// Otherwise, check that ps4-clang reports a warning. - -// setting up SCE_PS4_SDK_DIR to existing location, which is not a PS4 SDK. -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=WARN-SYS-LIBS -check-prefix=NO-WARN %s - -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -c -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -S -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -E -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -emit-ast -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=WARN-SYS-LIBS -check-prefix=NO-WARN %s - -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -c -nostdinc -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -S -nostdinc -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -E -nostdinc -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -emit-ast -nostdinc -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s - -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -c --sysroot=foo/ -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -S --sysroot=foo/ -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -E --sysroot=foo/ -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -emit-ast --sysroot=foo/ -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=NO-WARN %s - -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -c -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -S -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -E -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -emit-ast -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### --sysroot=foo/ -isysroot foo -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-ISYSROOT -check-prefix=NO-WARN %s - -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -nostdlib -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s -// RUN: env SCE_PS4_SDK_DIR=.. %clang -Winvalid-or-nonexistent-directory -### -nodefaultlibs -target x86_64-scei-ps4 %s 2>&1 | FileCheck -check-prefix=WARN-SYS-HEADERS -check-prefix=NO-WARN %s - -// NO-WARN-NOT: {{warning:|error:}} -// WARN-SYS-HEADERS: warning: unable to find PS4 system headers directory -// WARN-ISYSROOT: warning: no such sysroot directory: 'foo' -// WARN-SYS-LIBS: warning: unable to find PS4 system libraries directory -// NO-WARN-NOT: {{warning:|error:}} diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c index 487af569f2..7fecd1b021 100644 --- a/test/Driver/stack-protector.c +++ b/test/Driver/stack-protector.c @@ -23,12 +23,3 @@ // RUN: %clang -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SSP-ALL // SSP-ALL: "-stack-protector" "3" // SSP-ALL-NOT: "-stack-protector-buffer-size" - -// RUN: %clang -target x86_64-scei-ps4 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4 -// RUN: %clang -target x86_64-scei-ps4 -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4 -// SSP-PS4: "-stack-protector" "2" -// SSP-PS4-NOT: "-stack-protector-buffer-size" - -// RUN: %clang -target x86_64-scei-ps4 -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4-BUF -// SSP-PS4-BUF: "-stack-protector" "2" -// SSP-PS4-BUF: "-stack-protector-buffer-size" "16" -- 2.40.0