RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Synchronize the NaCl DataLayout strings with the ones in clang.

Browse Source 
Patch by Derek Schuff.

llvm-svn: 197640
This commit is contained in:
Rafael Espindola 2013-12-19 00:44:37 +00:00
parent 660bf702a1
commit 859cb122ba
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/ARM/ARMTargetMachine.cpp
View File

@ -102,8 +102,11 @@ static std::string computeDataLayout(ARMSubtarget &ST) {
// Integer registers are 32 bits.
Ret += "-n32";
// The stack is 64 bit aligned on AAPCS and 32 bit aligned everywhere else.
if (ST.isAAPCS_ABI())
// The stack is 128 bit aligned on NaCl, 64 bit aligned on AAPCS and 32 bit
// aligned everywhere else.
if (ST.isTargetNaCl())
Ret += "-S128";
else if (ST.isAAPCS_ABI())
Ret += "-S64";
else
Ret += "-S32";

3
lib/Target/X86/X86Subtarget.h
View File

@ -246,7 +246,8 @@ public:
/// Is this x86_64 with the ILP32 programming model (x32 ABI)?
bool isTarget64BitILP32() const {
return In64BitMode && (TargetTriple.getEnvironment() == Triple::GNUX32);
return In64BitMode && (TargetTriple.getEnvironment() == Triple::GNUX32 ||
TargetTriple.getOS() == Triple::NaCl);
}
/// Is this x86_64 with the LP64 programming model (standard AMD64, no x32)?

7
lib/Target/X86/X86TargetMachine.cpp
View File

@ -39,13 +39,16 @@ static std::string computeDataLayout(const X86Subtarget &ST) {
Ret += "-p:32:32";
// Some ABIs align 64 bit integers and doubles to 64 bits, others to 32.
if (ST.is64Bit() || ST.isTargetCygMing() || ST.isTargetWindows())
if (ST.is64Bit() || ST.isTargetCygMing() || ST.isTargetWindows() ||
ST.isTargetNaCl())
Ret += "-i64:64";
else
Ret += "-f64:32:64";
// Some ABIs align long double to 128 bits, others to 32.
if (ST.is64Bit() || ST.isTargetDarwin())
if (ST.isTargetNaCl())
; // No f80
else if (ST.is64Bit() || ST.isTargetDarwin())
Ret += "-f80:128";
else
Ret += "-f80:32";