diff options
| author | Erich Keane <erich.keane@intel.com> | 2017-12-11 18:14:51 +0000 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2017-12-11 18:14:51 +0000 |
| commit | d2dd52d1df034f6060a06604d2be1743285cfcae (patch) | |
| tree | ce99442b5948063e1b36a346c0180faaac3810cf /lib/Driver/ToolChains | |
| parent | 84bf555dbe0c7836c8f67eea29a7cc9390b897bf (diff) | |
Revert 320391: Certain targets are failing, pulling back to diagnose.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@320398 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChains')
| -rw-r--r-- | lib/Driver/ToolChains/Linux.cpp | 12 | ||||
| -rw-r--r-- | lib/Driver/ToolChains/Linux.h | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp index 5c3697391d..1301cdf114 100644 --- a/lib/Driver/ToolChains/Linux.cpp +++ b/lib/Driver/ToolChains/Linux.cpp @@ -710,8 +710,6 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include"); addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); - - AddGnuIncludeArgs(DriverArgs, CC1Args); } static std::string DetectLibcxxIncludePath(StringRef base) { @@ -750,16 +748,6 @@ std::string Linux::findLibCxxIncludePath() const { return ""; } -void Linux::AddGnuIncludeArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - if (!DriverArgs.hasArg(options::OPT_ffreestanding)) { - // For gcc compatibility, clang will preinclude <stdc-predef.h> - // -ffreestanding suppresses this behavior. - CC1Args.push_back("-fsystem-include-if-exists"); - CC1Args.push_back("stdc-predef.h"); - } -} - void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { // We need a detected GCC installation on Linux to provide libstdc++'s diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h index 8b7e2e2ad5..9778c1832c 100644 --- a/lib/Driver/ToolChains/Linux.h +++ b/lib/Driver/ToolChains/Linux.h @@ -31,8 +31,6 @@ public: void addLibStdCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; - void AddGnuIncludeArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const; void AddCudaIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs, |