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

ARM: Use front-end specific target features "soft-float" and "soft-float-abi" to communicate FP mode to target; __SOFTFP__ is set correctly now. 

llvm-svn: 91755
This commit is contained in:
Daniel Dunbar 2009-12-19 04:15:38 +00:00
parent c745a620a2
commit 893d475ba8
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clang/lib/Basic/Targets.cpp
View File

@ -1187,7 +1187,11 @@ class ARMTargetInfo : public TargetInfo {
static const char * const GCCRegNames[];
std::string ABI, CPU;
bool IsThumb;
unsigned IsThumb : 1;
// Initialized via features.
unsigned SoftFloat : 1;
unsigned SoftFloatABI : 1;
public:
ARMTargetInfo(const std::string &TripleStr)
@ -1240,6 +1244,36 @@ public:
return true;
}
virtual bool setFeatureEnabled(llvm::StringMap<bool> &Features,
const std::string &Name,
bool Enabled) const {
if (Name != "soft-float" && Name != "soft-float-abi")
return false;
Features[Name] = Enabled;
return true;
}
virtual void HandleTargetFeatures(std::vector<std::string> &Features) {
SoftFloat = SoftFloatABI = false;
for (unsigned i = 0, e = Features.size(); i != e; ++i) {
if (Features[i] == "+soft-float")
SoftFloat = true;
else if (Features[i] == "+soft-float-abi")
SoftFloatABI = true;
}
// Remove front-end specific options which the backend handles differently.
std::vector<std::string>::iterator it;
it = std::find(Features.begin(), Features.end(), "+soft-float");
if (it != Features.end())
Features.erase(it);
it = std::find(Features.begin(), Features.end(), "+soft-float-abi");
if (it != Features.end())
Features.erase(it);
}
static const char *getCPUDefineSuffix(llvm::StringRef Name) {
return llvm::StringSwitch<const char*>(Name)
.Cases("arm8", "arm810", "4")
@ -1294,9 +1328,7 @@ public:
if (ABI == "aapcs" || ABI == "aapcs-linux")
Define(Defs, "__ARM_EABI__");
// FIXME: This isn't correct, this should be set based on the various float
// options.
if (CPUArch[0] <= '5')
if (SoftFloat)
Define(Defs, "__SOFTFP__");
if (CPU == "xscale")

20
clang/lib/Driver/Tools.cpp
View File

@ -230,7 +230,7 @@ static const char *getARMTargetCPU(const ArgList &Args) {
if (MArch == "armv5e" || MArch == "armv5te")
return "arm1026ejs";
if (MArch == "armv5tej")
return "arm926ejs";
return "arm926ej-s";
if (MArch == "armv6" || MArch == "armv6k")
return "arm1136jf-s";
if (MArch == "armv6j")
@ -432,6 +432,24 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
CmdArgs.push_back("-mfloat-abi");
CmdArgs.push_back("hard");
}
// Set appropriate target features for floating point mode.
//
// FIXME: Note, this is a hack, the LLVM backend doesn't actually use these
// yet (it uses the -mfloat-abi and -msoft-float options above), and it is
// stripped out by the ARM target.
// Use software floating point operations?
if (FloatABI == "soft") {
CmdArgs.push_back("-target-feature");
CmdArgs.push_back("+soft-float");
}
// Use software floating point argument passing?
if (FloatABI != "hard") {
CmdArgs.push_back("-target-feature");
CmdArgs.push_back("+soft-float-abi");
}
}
void Clang::AddX86TargetArgs(const ArgList &Args,