2 files changed, 0 insertions, 6 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 2783664e53..c814086473 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -5195,11 +5195,6 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) {
     return 0;
   // @LOCALMOD-BEGIN
   // Native Client Intrinsics for TLS setup / layout.
-  case Intrinsic::nacl_tp_alignment: {
-    EVT DestVT = TLI.getValueType(I.getType());
-    setValue(&I, DAG.getNode(ISD::NACL_TP_ALIGN, dl, DestVT));
-    return 0;
-  }
   case Intrinsic::nacl_tp_tls_offset: {
     SDValue tls_size = getValue(I.getArgOperand(0));
     setValue(&I, DAG.getNode(ISD::NACL_TP_TLS_OFFSET, dl,
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
index b6f2ff410d..66f87b4ba0 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
@@ -314,7 +314,6 @@ std::string SDNode::getOperationName(const SelectionDAG *G) const {
 
   // @LOCALMOD-BEGIN
   // NaCl intrinsics for TLS setup
-  case ISD::NACL_TP_ALIGN:             return "nacl_tp_alignment";
   case ISD::NACL_TP_TLS_OFFSET:        return "nacl_tls_offset";
   case ISD::NACL_TP_TDB_OFFSET:        return "nacl_tdb_offset";
   case ISD::NACL_TARGET_ARCH:          return "nacl_target_arch";