diff --git a/autoconf/m4/visibility_inlines_hidden.m4 b/autoconf/m4/visibility_inlines_hidden.m4
index ee3d61bc82d..65dd503e203 100644
--- a/autoconf/m4/visibility_inlines_hidden.m4
+++ b/autoconf/m4/visibility_inlines_hidden.m4
@@ -8,9 +8,9 @@ AC_DEFUN([AC_CXX_USE_VISIBILITY_INLINES_HIDDEN],
                 [llvm_cv_cxx_visibility_inlines_hidden],
 [ AC_LANG_PUSH([C++])
   oldcxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+  CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden -Werror"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-    [template <typename T> struct X { inline void f() {} };],
+    [template <typename T> struct X { void __attribute__((noinline)) f() {} };],
     [X<int>().f();])],
     [llvm_cv_cxx_visibility_inlines_hidden=yes],[llvm_cv_cxx_visibility_inlines_hidden=no])
   CXXFLAGS="$oldcxxflags"
diff --git a/configure b/configure
index 62b2d1cc9be..7c86dbf8160 100755
--- a/configure
+++ b/configure
@@ -20986,14 +20986,14 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   oldcxxflags="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+  CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden -Werror"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-template <typename T> struct X { inline void f() {} };
+template <typename T> struct X { void __attribute__((noinline)) f() {} };
 int
 main ()
 {