maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver/FreeBSD: Change how FreeBSD derives the Lib32 variable, to normalize tool 

chain construction.

llvm-svn: 110025
This commit is contained in:
Daniel Dunbar 2010-08-02 05:43:59 +00:00
parent cc7df6cc7b
commit a18a487633
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/Driver/HostInfo.cpp
View File

@ -363,27 +363,18 @@ bool FreeBSDHostInfo::useDriverDriver() const {
ToolChain *FreeBSDHostInfo::CreateToolChain(const ArgList &Args,
const char *ArchName) const {
bool Lib32 = false;
assert(!ArchName &&
"Unexpected arch name on platform without driver driver support.");
// On x86_64 we need to be able to compile 32-bits binaries as well.
// Compiling 64-bit binaries on i386 is not supported. We don't have a
// lib64.
std::string Arch = getArchName();
ArchName = Arch.c_str();
if (Args.hasArg(options::OPT_m32) && getArchName() == "x86_64") {
ArchName = "i386";
Lib32 = true;
}
ToolChain *&TC = ToolChains[ArchName];
if (!TC) {
llvm::Triple TCTriple(getTriple());
TCTriple.setArchName(ArchName);
TC = new toolchains::FreeBSD(*this, TCTriple, Lib32);
TC = new toolchains::FreeBSD(*this, TCTriple);
}
return TC;

10
clang/lib/Driver/ToolChains.cpp
View File

@ -889,8 +889,16 @@ Tool &OpenBSD::SelectTool(const Compilation &C, const JobAction &JA) const {
/// FreeBSD - FreeBSD tool chain which can call as(1) and ld(1) directly.
FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple, bool Lib32)
FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple)
: Generic_GCC(Host, Triple) {
// Determine if we are compiling 32-bit code on an x86_64 platform.
bool Lib32 = false;
if (Triple.getArch() == llvm::Triple::x86 &&
llvm::Triple(getDriver().DefaultHostTriple).getArch() ==
llvm::Triple::x86_64)
Lib32 = true;
getProgramPaths().push_back(getDriver().Dir + "/../libexec");
getProgramPaths().push_back("/usr/libexec");
if (Lib32) {

2
clang/lib/Driver/ToolChains.h
View File

@ -269,7 +269,7 @@ public:
class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_GCC {
public:
FreeBSD(const HostInfo &Host, const llvm::Triple& Triple, bool Lib32);
FreeBSD(const HostInfo &Host, const llvm::Triple& Triple);
virtual Tool &SelectTool(const Compilation &C, const JobAction &JA) const;
};