diff --git a/llvm/utils/TableGen/NeonEmitter.cpp b/llvm/utils/TableGen/NeonEmitter.cpp
index 0a12f3766699..5db1564229da 100644
--- a/llvm/utils/TableGen/NeonEmitter.cpp
+++ b/llvm/utils/TableGen/NeonEmitter.cpp
@@ -912,7 +912,7 @@ void NeonEmitter::run(raw_ostream &OS) {
       OS << "typedef __attribute__(( __vector_size__(";
       
       OS << utostr(8*v*(quad ? 2 : 1)) << ") )) ";
-      if (!quad)
+      if (!quad && v == 1)
         OS << " ";
       
       OS << TypeString('s', TDTypeVec[i]);