diff --git a/configure b/configure
index 8c59539b3a9..4bbc446ab32 100755
--- a/configure
+++ b/configure
@@ -5790,7 +5790,6 @@ fi
 
 
 
-
 { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
@@ -10596,7 +10595,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10599 "configure"
+#line 10598 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index c5d354e542d..3670de557f4 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -549,6 +549,9 @@
 /* Installation directory for config files */
 #undef LLVM_ETCDIR
 
+/* Has gcc/MSVC atomic intrinsics */
+#undef LLVM_HAS_ATOMICS
+
 /* Host triple we were built on */
 #undef LLVM_HOSTTRIPLE
 
@@ -564,9 +567,6 @@
 /* Installation directory for man pages */
 #undef LLVM_MANDIR
 
-/* Has gcc/MSVC atomic intrinsics */
-#undef LLVM_HAS_ATOMICS
-
 /* LLVM architecture name for the native architecture, if available */
 #undef LLVM_NATIVE_ARCH