feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Forward compiler options for gcc/clang

Browse Source 
Rely on clang to do the "right thing" with them.

Change-Id: I44adf2cd5c61549896da3fc9b7c35c2fb0142060
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-08 16:22:39 +01:00
parent d52af48883
commit 4c0c3f5a64
9 changed files with 206 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -93,6 +93,7 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
UsePrecompiledHeaders usePrecompiledHeaders)
{
m_options.clear();
evaluateCompilerFlags();
if (fileKind == ProjectFile::CHeader || fileKind == ProjectFile::CSource) {
QTC_ASSERT(m_projectPart.languageVersion <= Utils::LanguageVersion::LatestC,
@@ -108,22 +109,23 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
addWordWidth();
addTargetTriple();
addExtraCodeModelFlags();
updateFileLanguage(fileKind);
addLanguageVersionAndExtensions();
addPrecompiledHeaderOptions(usePrecompiledHeaders);
addProjectConfigFileInclude();
addExtraCodeModelFlags();
addCompilerFlags();
addMsvcCompatibilityVersion();
addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc();
undefineCppLanguageFeatureMacrosForMsvc2015();
addDefineFunctionMacrosMsvc();
addToolchainFlags();
addPrecompiledHeaderOptions(usePrecompiledHeaders);
addHeaderPathOptions();
addProjectConfigFileInclude();
addMsvcCompatibilityVersion();
addExtraOptions();
@@ -214,6 +216,12 @@ void CompilerOptionsBuilder::addExtraCodeModelFlags()
m_options.append(m_projectPart.extraCodeModelFlags);
}
void CompilerOptionsBuilder::addCompilerFlags()
{
if (m_compilerFlags.forward)
m_options.append(m_compilerFlags.flags);
}
static QString creatorResourcePath()
{
#ifndef UNIT_TESTS
@@ -341,48 +349,53 @@ void CompilerOptionsBuilder::addLanguageVersionAndExtensions()
const Utils::LanguageExtensions languageExtensions = m_projectPart.languageExtensions;
const bool gnuExtensions = languageExtensions & LanguageExtension::Gnu;
switch (m_projectPart.languageVersion) {
case LanguageVersion::C89:
options << (gnuExtensions ? QLatin1String("-std=gnu89") : QLatin1String("-std=c89"));
break;
case LanguageVersion::C99:
options << (gnuExtensions ? QLatin1String("-std=gnu99") : QLatin1String("-std=c99"));
break;
case LanguageVersion::C11:
options << (gnuExtensions ? QLatin1String("-std=gnu11") : QLatin1String("-std=c11"));
break;
case LanguageVersion::C18:
// Clang 6, 7 and current trunk do not accept "gnu18"/"c18", so use the "*17" variants.
options << (gnuExtensions ? QLatin1String("-std=gnu17") : QLatin1String("-std=c17"));
break;
case LanguageVersion::CXX11:
options << (gnuExtensions ? QLatin1String("-std=gnu++11") : QLatin1String("-std=c++11"));
break;
case LanguageVersion::CXX98:
options << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98"));
break;
case LanguageVersion::CXX03:
options << (gnuExtensions ? QLatin1String("-std=gnu++03") : QLatin1String("-std=c++03"));
break;
case LanguageVersion::CXX14:
options << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14"));
break;
case LanguageVersion::CXX17:
options << (gnuExtensions ? QLatin1String("-std=gnu++17") : QLatin1String("-std=c++17"));
break;
case LanguageVersion::CXX2a:
options << (gnuExtensions ? QLatin1String("-std=gnu++2a") : QLatin1String("-std=c++2a"));
break;
if (!m_compilerFlags.forward
|| (m_compilerFlags.forward && !m_compilerFlags.isLanguageVersionSpecified)) {
switch (m_projectPart.languageVersion) {
case LanguageVersion::C89:
options << (gnuExtensions ? QLatin1String("-std=gnu89") : QLatin1String("-std=c89"));
break;
case LanguageVersion::C99:
options << (gnuExtensions ? QLatin1String("-std=gnu99") : QLatin1String("-std=c99"));
break;
case LanguageVersion::C11:
options << (gnuExtensions ? QLatin1String("-std=gnu11") : QLatin1String("-std=c11"));
break;
case LanguageVersion::C18:
// Clang 6, 7 and current trunk do not accept "gnu18"/"c18", so use the "*17" variants.
options << (gnuExtensions ? QLatin1String("-std=gnu17") : QLatin1String("-std=c17"));
break;
case LanguageVersion::CXX11:
options << (gnuExtensions ? QLatin1String("-std=gnu++11") : QLatin1String("-std=c++11"));
break;
case LanguageVersion::CXX98:
options << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98"));
break;
case LanguageVersion::CXX03:
options << (gnuExtensions ? QLatin1String("-std=gnu++03") : QLatin1String("-std=c++03"));
break;
case LanguageVersion::CXX14:
options << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14"));
break;
case LanguageVersion::CXX17:
options << (gnuExtensions ? QLatin1String("-std=gnu++17") : QLatin1String("-std=c++17"));
break;
case LanguageVersion::CXX2a:
options << (gnuExtensions ? QLatin1String("-std=gnu++2a") : QLatin1String("-std=c++2a"));
break;
}
}
if (languageExtensions & LanguageExtension::Microsoft)
options << "-fms-extensions";
if (!m_compilerFlags.forward) {
if (languageExtensions & LanguageExtension::Microsoft)
options << "-fms-extensions";
if (languageExtensions & LanguageExtension::OpenMP)
options << "-fopenmp";
if (languageExtensions & LanguageExtension::OpenMP)
options << "-fopenmp";
if (languageExtensions & LanguageExtension::Borland)
options << "-fborland-extensions";
if (languageExtensions & LanguageExtension::Borland)
options << "-fborland-extensions";
}
m_options.append(options);
}
@@ -587,7 +600,7 @@ void CompilerOptionsBuilder::addToolchainFlags()
&& m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) {
if (m_useToolchainMacros == UseToolchainMacros::Yes)
add("-undef");
else
else if (!m_compilerFlags.forward)
add("-fPIC");
}
}
@@ -632,4 +645,37 @@ void CompilerOptionsBuilder::reset()
m_options.clear();
}
// Some example command lines for a "Qt Console Application":
// CMakeProject: -fPIC -std=gnu++11
// QbsProject: -m64 -fPIC -std=c++11 -fexceptions
// QMakeProject: -pipe -Whello -g -std=gnu++11 -Wall -W -D_REENTRANT -fPIC
void CompilerOptionsBuilder::evaluateCompilerFlags()
{
const Core::Id &toolChain = m_projectPart.toolchainType;
if (toolChain == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID
|| toolChain == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID) {
m_compilerFlags.forward = true;
for (const QString &option : m_projectPart.compilerFlags) {
// Ignore warning flags as these interfere with ouser user-configured diagnostics.
// Note that once "-w" is provided, no warnings will be emitted, even if "-Wall" follows.
if (option.startsWith("-w", Qt::CaseInsensitive) // -w, -W...
|| option.startsWith("-pedantic")) {
continue;
}
// Check whether a language version is already used.
// Modify if needed as clang accepts c18/gnu18, but not c17/gnu17.
QString theOption = option;
if (theOption.startsWith("-std=")) {
m_compilerFlags.isLanguageVersionSpecified = true;
theOption.replace("=c18", "=c17");
theOption.replace("=gnu18", "=gnu17");
}
m_compilerFlags.flags.append(theOption);
}
}
}
} // namespace CppTools

9
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -61,6 +61,7 @@ public:
void addTargetTriple();
void addExtraCodeModelFlags();
void addCompilerFlags();
void insertWrappedQtHeaders();
void addLanguageVersionAndExtensions();
void updateFileLanguage(ProjectFile::Kind fileKind);
@@ -80,10 +81,12 @@ public:
void reset();
private:
void evaluateCompilerFlags();
bool excludeDefineDirective(const ProjectExplorer::Macro &macro) const;
QString includeDirOptionForPath(const QString &path) const;
void addWrappedQtHeadersIncludePath(QStringList &list) const;
QString includeDirOptionForSystemPath(ProjectExplorer::HeaderPathType type) const;
QByteArray msvcVersion() const;
private:
const ProjectPart &m_projectPart;
@@ -96,7 +99,11 @@ private:
const QString m_clangVersion;
const QString m_clangResourceDirectory;
QByteArray msvcVersion() const;
struct {
bool forward = false;
QStringList flags;
bool isLanguageVersionSpecified = false;
} m_compilerFlags;
QStringList m_options;
};

1
src/plugins/cpptools/cppcodemodelinspectordumper.cpp
View File

@@ -505,6 +505,7 @@ void Dumper::dumpProjectInfos( const QList<ProjectInfo> &projectInfos)
m_out << i3 << "Project Part Name : " << part->displayName << "\n";
m_out << i3 << "Project Name : " << projectName << "\n";
m_out << i3 << "Project File : " << projectFilePath << "\n";
m_out << i3 << "Compiler Flags : " << part->compilerFlags.join(", ") << "\n";
m_out << i3 << "Selected For Building: " << part->selectedForBuilding << "\n";
m_out << i3 << "Build Target Type : " << Utils::toString(part->buildTargetType) << "\n";
m_out << i3 << "Lanugage Version : " << Utils::toString(part->languageVersion)<<"\n";

1
src/plugins/cpptools/cppprojectinfogenerator.cpp
View File

@@ -162,6 +162,7 @@ ProjectPart::Ptr ProjectInfoGenerator::createProjectPart(
: ProjectPart::WordWidth32Bit;
part->toolChainTargetTriple = tcInfo.targetTriple;
part->extraCodeModelFlags = tcInfo.extraCodeModelFlags;
part->compilerFlags = flags.commandLineFlags;
part->warningFlags = flags.warningFlags;
part->languageExtensions = flags.languageExtensions;

2
src/plugins/cpptools/cpprawprojectpart.cpp
View File

@@ -36,8 +36,8 @@ RawProjectPartFlags::RawProjectPartFlags(const ProjectExplorer::ToolChain *toolC
{
// Keep the following cheap/non-blocking for the ui thread. Expensive
// operations are encapsulated in ToolChainInfo as "runners".
this->commandLineFlags = commandLineFlags;
if (toolChain) {
this->commandLineFlags = commandLineFlags;
warningFlags = toolChain->warningFlags(commandLineFlags);
languageExtensions = toolChain->languageExtensions(commandLineFlags);
}

1
src/plugins/cpptools/projectpart.h
View File

@@ -120,6 +120,7 @@ public:
// Misc
QStringList extraCodeModelFlags;
QStringList compilerFlags;
};
} // namespace CppTools