summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2011-12-22 22:50:44 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2011-12-22 22:50:44 +0000
commitb8c20b8d78f946a1657825f7e0a48c6ead352ca6 (patch)
tree126300456faeedbc53e888ec756ddb92d1601479
parent30450e89d94a5d7daa887c7b25a33aa9aa19863c (diff)
downloadllvm-b8c20b8d78f946a1657825f7e0a48c6ead352ca6.tar.gz
llvm-b8c20b8d78f946a1657825f7e0a48c6ead352ca6.tar.bz2
llvm-b8c20b8d78f946a1657825f7e0a48c6ead352ca6.tar.xz
Attempt #2 to fix mingw crossbuild. This time with more ugly hacks!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147196 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--autoconf/m4/visibility_inlines_hidden.m44
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 4 deletions
diff --git a/autoconf/m4/visibility_inlines_hidden.m4 b/autoconf/m4/visibility_inlines_hidden.m4
index ee3d61bc82..65dd503e20 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 62b2d1cc9b..7c86dbf816 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 ()
{