1 files changed, 26 insertions, 1 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 1eb251d0a6..9263a2a3aa 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -5251,6 +5251,28 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) {
   case Intrinsic::donothing:
     // ignore
     return 0;
+  // @LOCALMOD-BEGIN
+  // Native Client Intrinsics for TLS setup / layout.
+  case Intrinsic::nacl_tp_tls_offset: {
+    SDValue tls_size = getValue(I.getArgOperand(0));
+    setValue(&I, DAG.getNode(ISD::NACL_TP_TLS_OFFSET, dl,
+                             tls_size.getValueType(),
+                             tls_size));
+    return 0;
+  }
+  case Intrinsic::nacl_tp_tdb_offset: {
+    SDValue tdb_size = getValue(I.getArgOperand(0));
+    setValue(&I, DAG.getNode(ISD::NACL_TP_TDB_OFFSET, dl,
+                             tdb_size.getValueType(),
+                             tdb_size));
+    return 0;
+  }
+  case Intrinsic::nacl_target_arch: {
+    EVT DestVT = TLI.getValueType(I.getType());
+    setValue(&I, DAG.getNode(ISD::NACL_TARGET_ARCH, dl, DestVT));
+    return 0;
+  }
+  // @LOCALMOD-END
   }
 }
 
@@ -6405,7 +6427,10 @@ void SelectionDAGBuilder::visitVAArg(const VAArgInst &I) {
   SDValue V = DAG.getVAArg(TLI.getValueType(I.getType()), getCurDebugLoc(),
                            getRoot(), getValue(I.getOperand(0)),
                            DAG.getSrcValue(I.getOperand(0)),
-                           TD.getABITypeAlignment(I.getType()));
+// @LOCALMOD-BEGIN
+                           TD.getCallFrameTypeAlignment(I.getType()));
+// @LOCALMOD-END
+
   setValue(&I, V);
   DAG.setRoot(V.getValue(1));
 }