diff --git a/configure b/configure
index 2b759b73e12..3f3548eb767 100755
--- a/configure
+++ b/configure
@@ -18207,6 +18207,16 @@ if test "$ac_cv_c_cfi_support" = "yes"
 then
    asm_func_header="$asm_func_header.cfi_startproc\\n\\t"
    asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer"
+
+cat >>confdefs.h <<\_ACEOF
+#define __ASM_CFI(str) str
+_ACEOF
+
+else
+   cat >>confdefs.h <<\_ACEOF
+#define __ASM_CFI(str) ""
+_ACEOF
+
 fi
 
 asm_func_code="$asm_func_header\" code \"$asm_func_trailer"
diff --git a/configure.ac b/configure.ac
index eb276b6b560..bb4d82edef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1519,6 +1519,9 @@ if test "$ac_cv_c_cfi_support" = "yes"
 then
    asm_func_header="$asm_func_header.cfi_startproc\\n\\t"
    asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer"
+   AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op])
+else
+   AC_DEFINE([__ASM_CFI(str)],[""])
 fi
 
 asm_func_code="$asm_func_header\" code \"$asm_func_trailer"
diff --git a/include/config.h.in b/include/config.h.in
index 99ecae35792..f6799c6085c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -1188,6 +1188,9 @@
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
+/* Define to a macro to output a .cfi assembly pseudo-op */
+#undef __ASM_CFI
+
 /* Define to a macro to define an assembly function */
 #undef __ASM_DEFINE_FUNC