Index: llvm/trunk/lib/MC/MCAsmStreamer.cpp
===================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp
@@ -565,7 +565,7 @@
     case MCSA_ELF_TypeObject:      OS << "object"; break;
     case MCSA_ELF_TypeTLS:         OS << "tls_object"; break;
     case MCSA_ELF_TypeCommon:      OS << "common"; break;
-    case MCSA_ELF_TypeNoType:      OS << "no_type"; break;
+    case MCSA_ELF_TypeNoType:      OS << "notype"; break;
     case MCSA_ELF_TypeGnuUniqueObject: OS << "gnu_unique_object"; break;
     }
     EmitEOL();
Index: llvm/trunk/test/MC/ARM/type-directive-print.ll
===================================================================
--- llvm/trunk/test/MC/ARM/type-directive-print.ll
+++ llvm/trunk/test/MC/ARM/type-directive-print.ll
@@ -0,0 +1,17 @@
+; RUN: llc < %s -mtriple=armv7a | FileCheck %s
+
+module asm ".type test_notype, %notype"
+module asm ".type test_function, %function"
+module asm ".type test_object, %object"
+module asm ".type test_common, %common"
+module asm ".type test_tls_object, %tls_object"
+module asm ".type test_gnu_indirect_function, %gnu_indirect_function"
+module asm ".type test_gnu_unique_object, %gnu_unique_object"
+
+; CHECK: .type test_notype,%notype
+; CHECK: .type test_function,%function
+; CHECK: .type test_object,%object
+; CHECK: .type test_common,%common
+; CHECK: .type test_tls_object,%tls_object
+; CHECK: .type test_gnu_indirect_function,%gnu_indirect_function
+; CHECK: .type test_gnu_unique_object,%gnu_unique_object