summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/ARMTargetMachine.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-12-19 00:44:37 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-12-19 00:44:37 +0000
commitddb913cc8f95709ef68be05a9a95c2cf225d4a28 (patch)
tree991b3b5caa0f5d9dc67da970f8731a4e87a03e76 /llvm/lib/Target/ARM/ARMTargetMachine.cpp
parentf037bd1e7c5bcd905c1a5678ddc671cd012ec4d9 (diff)
downloadbcm5719-llvm-ddb913cc8f95709ef68be05a9a95c2cf225d4a28.tar.gz
bcm5719-llvm-ddb913cc8f95709ef68be05a9a95c2cf225d4a28.zip
Synchronize the NaCl DataLayout strings with the ones in clang.
Patch by Derek Schuff. llvm-svn: 197640
Diffstat (limited to 'llvm/lib/Target/ARM/ARMTargetMachine.cpp')
-rw-r--r--llvm/lib/Target/ARM/ARMTargetMachine.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index 5afc7ccedf1..7f387ec466d 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -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";
OpenPOWER on IntegriCloud