diff --git a/builtins/target-avx-common.ll b/builtins/target-avx-common.ll
index 9194ea4c..a63dd7b2 100644
--- a/builtins/target-avx-common.ll
+++ b/builtins/target-avx-common.ll
@@ -288,5 +288,5 @@ define i64 @__popcnt_int64(i64) nounwind readonly alwaysinline {
 ;; int8/int16 builtins
 
 define_avgs()
-declare_nvptx64()
+declare_nvptx()
 
diff --git a/builtins/target-generic-common.ll b/builtins/target-generic-common.ll
index 0a51f44f..0ad63214 100644
--- a/builtins/target-generic-common.ll
+++ b/builtins/target-generic-common.ll
@@ -387,4 +387,4 @@ declare void @__prefetch_read_uniform_nt(i8 * nocapture) nounwind
 ;; int8/int16 builtins
 
 define_avgs()
-declare_nvptx64()
+declare_nvptx()
diff --git a/builtins/target-neon-common.ll b/builtins/target-neon-common.ll
index db71a8ae..cb9d291f 100644
--- a/builtins/target-neon-common.ll
+++ b/builtins/target-neon-common.ll
@@ -344,4 +344,4 @@ packed_load_and_store(4)
 ;; prefetch
 
 define_prefetches()
-declare_nvptx64()
+declare_nvptx()
diff --git a/builtins/target-sse2-common.ll b/builtins/target-sse2-common.ll
index 80bf3989..b20fdfb4 100644
--- a/builtins/target-sse2-common.ll
+++ b/builtins/target-sse2-common.ll
@@ -274,4 +274,4 @@ define i64 @__popcnt_int64(i64) nounwind readnone alwaysinline {
 
 define_avgs()
 
-declare_nvptx64()
+declare_nvptx()
diff --git a/builtins/target-sse4-common.ll b/builtins/target-sse4-common.ll
index 9aeb0dbc..e1f9b2c8 100644
--- a/builtins/target-sse4-common.ll
+++ b/builtins/target-sse4-common.ll
@@ -279,4 +279,4 @@ define i64 @__popcnt_int64(i64) nounwind readonly alwaysinline {
   ret i64 %call
 }
 
-declare_nvptx64()
+declare_nvptx()
diff --git a/builtins/util.m4 b/builtins/util.m4
index 9368a8e9..24b8b3df 100644
--- a/builtins/util.m4
+++ b/builtins/util.m4
@@ -4532,7 +4532,7 @@ define_up_avgs()
 define_down_avgs()
 ')
 
-define(`declare_nvptx64',
+define(`declare_nvptx',
 `
 declare i32 @__tid_x()  nounwind readnone alwaysinline
 declare i32 @__warpsize()  nounwind readnone alwaysinline