forked from OSchip/llvm-project
parent
928068a886
commit
864bf7562f
|
@ -160,7 +160,7 @@ public:
|
|||
NoInline = 0;
|
||||
|
||||
CharIsSigned = 1;
|
||||
ShortWChar = 0;
|
||||
ShortWChar = 0;
|
||||
|
||||
MainFileName = 0;
|
||||
}
|
||||
|
|
|
@ -145,10 +145,10 @@ bool TargetInfo::isTypeSigned(IntType T) const {
|
|||
/// Apply changes to the target information with respect to certain
|
||||
/// language options which change the target configuration.
|
||||
void TargetInfo::setForcedLangOptions(LangOptions &Opts) {
|
||||
if (Opts.ShortWChar) {
|
||||
if (Opts.ShortWChar) {
|
||||
WCharType = UnsignedShort;
|
||||
WCharWidth = WCharAlign = 16;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
|
|
@ -310,101 +310,101 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(const llvm::Triple &tripl
|
|||
break;
|
||||
case llvm::Triple::Darwin:
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
|
||||
"i686-apple-darwin10",
|
||||
"i686-apple-darwin10/x86_64",
|
||||
triple);
|
||||
"i686-apple-darwin10",
|
||||
"i686-apple-darwin10/x86_64",
|
||||
triple);
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
|
||||
"i686-apple-darwin8",
|
||||
"i686-apple-darwin8",
|
||||
triple);
|
||||
"i686-apple-darwin8",
|
||||
"i686-apple-darwin8",
|
||||
triple);
|
||||
break;
|
||||
case llvm::Triple::Linux:
|
||||
// Ubuntu 7.10 - Gutsy Gibbon
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.3",
|
||||
"i486-linux-gnu",
|
||||
"i486-linux-gnu",
|
||||
triple);
|
||||
"i486-linux-gnu",
|
||||
"i486-linux-gnu",
|
||||
triple);
|
||||
// Ubuntu 9.04
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.3",
|
||||
"x86_64-linux-gnu/32",
|
||||
"x86_64-linux-gnu",
|
||||
triple);
|
||||
"x86_64-linux-gnu/32",
|
||||
"x86_64-linux-gnu",
|
||||
triple);
|
||||
// Ubuntu 9.10
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.1",
|
||||
"x86_64-linux-gnu/32",
|
||||
"x86_64-linux-gnu",
|
||||
triple);
|
||||
"x86_64-linux-gnu/32",
|
||||
"x86_64-linux-gnu",
|
||||
triple);
|
||||
// Fedora 8
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.2",
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
// Fedora 9
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.0",
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
// Fedora 10
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.2",
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
"i386-redhat-linux",
|
||||
"i386-redhat-linux",
|
||||
triple);
|
||||
// openSUSE 11.1 32 bit
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
|
||||
"i586-suse-linux",
|
||||
"i586-suse-linux",
|
||||
triple);
|
||||
"i586-suse-linux",
|
||||
"i586-suse-linux",
|
||||
triple);
|
||||
// openSUSE 11.1 64 bit
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
|
||||
"x86_64-suse-linux/32",
|
||||
"x86_64-suse-linux",
|
||||
triple);
|
||||
"x86_64-suse-linux/32",
|
||||
"x86_64-suse-linux",
|
||||
triple);
|
||||
// openSUSE 11.2
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
|
||||
"i586-suse-linux",
|
||||
"i586-suse-linux",
|
||||
triple);
|
||||
"i586-suse-linux",
|
||||
"i586-suse-linux",
|
||||
triple);
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
|
||||
"x86_64-suse-linux",
|
||||
"x86_64-suse-linux",
|
||||
triple);
|
||||
"x86_64-suse-linux",
|
||||
"x86_64-suse-linux",
|
||||
triple);
|
||||
// Arch Linux 2008-06-24
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
|
||||
"x86_64-unknown-linux-gnu",
|
||||
"x86_64-unknown-linux-gnu",
|
||||
triple);
|
||||
"x86_64-unknown-linux-gnu",
|
||||
"x86_64-unknown-linux-gnu",
|
||||
triple);
|
||||
// Gentoo x86 2009.1 stable
|
||||
AddGnuCPlusPlusIncludePaths(
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.3.4/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.3.4/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
// Gentoo x86 2009.0 stable
|
||||
AddGnuCPlusPlusIncludePaths(
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
// Gentoo x86 2008.0 stable
|
||||
AddGnuCPlusPlusIncludePaths(
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
"/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
|
||||
"i686-pc-linux-gnu",
|
||||
"i686-pc-linux-gnu",
|
||||
triple);
|
||||
// Ubuntu 8.10
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
|
||||
"i486-pc-linux-gnu",
|
||||
"i486-pc-linux-gnu",
|
||||
triple);
|
||||
"i486-pc-linux-gnu",
|
||||
"i486-pc-linux-gnu",
|
||||
triple);
|
||||
// Ubuntu 9.04
|
||||
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
|
||||
"i486-linux-gnu",
|
||||
"i486-linux-gnu",
|
||||
triple);
|
||||
"i486-linux-gnu",
|
||||
"i486-linux-gnu",
|
||||
triple);
|
||||
// Gentoo amd64 stable
|
||||
AddGnuCPlusPlusIncludePaths(
|
||||
"/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",
|
||||
|
|
|
@ -817,8 +817,8 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
|
|||
Options.Blocks = EnableBlocks;
|
||||
if (CharIsSigned.getPosition())
|
||||
Options.CharIsSigned = CharIsSigned;
|
||||
if (ShortWChar.getPosition())
|
||||
Options.ShortWChar = ShortWChar;
|
||||
if (ShortWChar.getPosition())
|
||||
Options.ShortWChar = ShortWChar;
|
||||
|
||||
if (!AllowBuiltins)
|
||||
Options.NoBuiltin = 1;
|
||||
|
@ -884,7 +884,7 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
|
|||
if (MainFileName.getPosition())
|
||||
Options.setMainFileName(MainFileName.c_str());
|
||||
|
||||
Target->setForcedLangOptions(Options);
|
||||
Target->setForcedLangOptions(Options);
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
@ -1041,7 +1041,7 @@ void AddClangIncludePaths(const char *Argv0, InitHeaderSearch *Init) {
|
|||
// We pass true to ignore sysroot so that we *always* look for clang headers
|
||||
// relative to our executable, never relative to -isysroot.
|
||||
Init->AddPath(MainExecutablePath.c_str(), InitHeaderSearch::System,
|
||||
false, false, false, true /*ignore sysroot*/);
|
||||
false, false, false, true /*ignore sysroot*/);
|
||||
}
|
||||
|
||||
/// InitializeIncludePaths - Process the -I options and set them in the
|
||||
|
|
Loading…
Reference in New Issue