diff --git a/sysdeps/arc/fpu/math-use-builtins-fma.h b/sysdeps/arc/fpu/math-use-builtins-fma.h
index 2acd8113ce..59c7ed0343 100644
--- a/sysdeps/arc/fpu/math-use-builtins-fma.h
+++ b/sysdeps/arc/fpu/math-use-builtins-fma.h
@@ -1,13 +1,17 @@
-#if defined __ARC_FPU_DP_FMA__
+#if defined __ARCV3__
 # define USE_FMA_BUILTIN 1
-#else
-# define USE_FMA_BUILTIN 0
-#endif
-
-#if defined __ARC_FPU_SP_FMA__
 # define USE_FMAF_BUILTIN 1
 #else
-# define USE_FMAF_BUILTIN 0
+# if defined __ARC_FPU_DP_FMA__
+#  define USE_FMA_BUILTIN 1
+# else
+#  define USE_FMA_BUILTIN 0
+# endif
+# if defined __ARC_FPU_SP_FMA__
+#  define USE_FMAF_BUILTIN 1
+# else
+#  define USE_FMAF_BUILTIN 0
+# endif
 #endif
 
 #define USE_FMAL_BUILTIN 0
diff --git a/sysdeps/arc/fpu/math-use-builtins-sqrt.h b/sysdeps/arc/fpu/math-use-builtins-sqrt.h
index a449bc6092..40a07730ea 100644
--- a/sysdeps/arc/fpu/math-use-builtins-sqrt.h
+++ b/sysdeps/arc/fpu/math-use-builtins-sqrt.h
@@ -1,13 +1,17 @@
-#if defined __ARC_FPU_DP_DIV__
+#if defined __ARCV3__
 # define USE_SQRT_BUILTIN 1
-#else
-# define USE_SQRT_BUILTIN 0
-#endif
-
-#if defined __ARC_FPU_SP_DIV__
 # define USE_SQRTF_BUILTIN 1
 #else
-# define USE_SQRTF_BUILTIN 0
+# if defined __ARC_FPU_DP_DIV__
+#  define USE_SQRT_BUILTIN 1
+# else
+#  define USE_SQRT_BUILTIN 0
+# endif
+# if defined __ARC_FPU_SP_DIV__
+#  define USE_SQRTF_BUILTIN 1
+# else
+#  define USE_SQRTF_BUILTIN 0
+# endif
 #endif
 
 #define USE_SQRTL_BUILTIN 0