Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: lib/LTO/LTOCodeGenerator.cpp

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: undo localmod Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/IRReader/LLVMBuild.txt ('k') | lib/LTO/LTOModule.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/LTO/LTOCodeGenerator.cpp
diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp
index c663d43fe7fdec56979651a2bde5f3052427c54a..7705bfe46b5aa1f11475df4c17995061d4002b86 100644
--- a/lib/LTO/LTOCodeGenerator.cpp
+++ b/lib/LTO/LTOCodeGenerator.cpp
@@ -277,6 +277,15 @@ bool LTOCodeGenerator::determineTarget(std::string &errMsg) {
return true;
std::string TripleStr = IRLinker.getModule()->getTargetTriple();
+
+ // @LOCALMOD-BEGIN
+ // Pretend that we are ARM for name mangling and assembly conventions.
+ // https://code.google.com/p/nativeclient/issues/detail?id=2554
+ if (TripleStr == "le32-unknown-nacl") {
+ TripleStr = "armv7a-none-nacl-gnueabi";
+ }
+ // @LOCALMOD-END
+
if (TripleStr.empty())
TripleStr = sys::getDefaultTargetTriple();
llvm::Triple Triple(TripleStr);
« no previous file with comments | « lib/IRReader/LLVMBuild.txt ('k') | lib/LTO/LTOModule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698