[NVPTX] Fix const modifier on builtins

Some NVVM intrinsics were incorrectly labeled.

llvm-svn: 167700
diff --git a/clang/include/clang/Basic/BuiltinsNVPTX.def b/clang/include/clang/Basic/BuiltinsNVPTX.def
index 2fde59b..3c3f06c 100644
--- a/clang/include/clang/Basic/BuiltinsNVPTX.def
+++ b/clang/include/clang/Basic/BuiltinsNVPTX.def
@@ -61,16 +61,16 @@
 
 
 // Builtins exposed as part of NVVM
-BUILTIN(__syncthreads, "v", "nc")
-BUILTIN(__nvvm_bar0, "v", "nc")
-BUILTIN(__nvvm_bar0_popc, "ii", "nc")
-BUILTIN(__nvvm_bar0_and, "ii", "nc")
-BUILTIN(__nvvm_bar0_or, "ii", "nc")
+BUILTIN(__syncthreads, "v", "n")
+BUILTIN(__nvvm_bar0, "v", "n")
+BUILTIN(__nvvm_bar0_popc, "ii", "n")
+BUILTIN(__nvvm_bar0_and, "ii", "n")
+BUILTIN(__nvvm_bar0_or, "ii", "n")
 BUILTIN(__nvvm_membar_cta, "v", "n")
 BUILTIN(__nvvm_membar_gl, "v", "n")
 BUILTIN(__nvvm_membar_sys, "v", "n")
-BUILTIN(__nvvm_popc_i, "ii", "n")
-BUILTIN(__nvvm_popc_ll, "iLLi", "n")
+BUILTIN(__nvvm_popc_i, "ii", "nc")
+BUILTIN(__nvvm_popc_ll, "LiLi", "nc")
 BUILTIN(__nvvm_prmt, "UiUiUiUi", "nc")
 BUILTIN(__nvvm_min_i, "iii", "nc")
 BUILTIN(__nvvm_min_ui, "UiUiUi", "nc")