diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c
index 65154a064fb..cd1724aebab 100644
--- a/src/amd/llvm/ac_llvm_build.c
+++ b/src/amd/llvm/ac_llvm_build.c
@@ -289,7 +289,6 @@ LLVMValueRef ac_build_intrinsic(struct ac_llvm_context *ctx, const char *name,
                                 unsigned attrib_mask)
 {
    LLVMValueRef call;
-   bool set_callsite_attrs = !(attrib_mask & AC_FUNC_ATTR_LEGACY);
 
    LLVMTypeRef param_types[32];
    assert(param_count <= 32);
@@ -306,14 +305,10 @@ LLVMValueRef ac_build_intrinsic(struct ac_llvm_context *ctx, const char *name,
 
       LLVMSetFunctionCallConv(function, LLVMCCallConv);
       LLVMSetLinkage(function, LLVMExternalLinkage);
-
-      if (!set_callsite_attrs)
-         ac_add_func_attributes(ctx->context, function, attrib_mask);
    }
 
    call = LLVMBuildCall2(ctx->builder, function_type, function, params, param_count, "");
-   if (set_callsite_attrs)
-      ac_add_func_attributes(ctx->context, call, attrib_mask);
+   ac_add_func_attributes(ctx->context, call, attrib_mask);
    return call;
 }
 
diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c
index 3116471b326..a82f5efe854 100644
--- a/src/amd/llvm/ac_llvm_util.c
+++ b/src/amd/llvm/ac_llvm_util.c
@@ -289,7 +289,6 @@ void ac_add_function_attr(LLVMContextRef ctx, LLVMValueRef function, int attr_id
 void ac_add_func_attributes(LLVMContextRef ctx, LLVMValueRef function, unsigned attrib_mask)
 {
    attrib_mask |= AC_FUNC_ATTR_NOUNWIND;
-   attrib_mask &= ~AC_FUNC_ATTR_LEGACY;
 
    while (attrib_mask) {
       enum ac_func_attr attr = 1u << u_bit_scan(&attrib_mask);
diff --git a/src/amd/llvm/ac_llvm_util.h b/src/amd/llvm/ac_llvm_util.h
index a670500e970..6fd4a5ff410 100644
--- a/src/amd/llvm/ac_llvm_util.h
+++ b/src/amd/llvm/ac_llvm_util.h
@@ -50,12 +50,6 @@ enum ac_func_attr
    AC_FUNC_ATTR_READONLY = (1 << 6),
    AC_FUNC_ATTR_WRITEONLY = (1 << 7),
    AC_FUNC_ATTR_CONVERGENT = (1 << 8),
-
-   /* Legacy intrinsic that needs attributes on function declarations
-    * and they must match the internal LLVM definition exactly, otherwise
-    * intrinsic selection fails.
-    */
-   AC_FUNC_ATTR_LEGACY = (1u << 31),
 };
 
 enum ac_target_machine_options