mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work around the C++11 __float128 problem with libstdc++ headers and clang

Browse Source 
Change-Id: Ia1b443d22b3b7f6f93f1ad8c5fa760b0f1da3b83
This commit is contained in:
Luboš Luňák
2013-06-13 19:29:32 +02:00
parent 44159c6cdf
commit 50d248aa3f
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/Makefile-clang.mk
View File

@@ -73,7 +73,7 @@ CLANGOBJS=
define clangbuildsrc
$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
$(QUIET)$(CXX) $(CLANGCXXFLAGS) $(CLANGWERROR) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config_host $(2) -fPIC -std=c++11 -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
$(QUIET)$(CXX) $(CLANGCXXFLAGS) $(CLANGWERROR) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config_host $(2) -fPIC $(CXXFLAGS_CXX11) -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
-include $(CLANGOUTDIR)/$(1).d

27
configure.ac
View File

@@ -5647,8 +5647,31 @@ return !(i != 0 && j != 0);
// (__float128)
]])
],[ AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
HAVE_CXX11=
[
AC_MSG_RESULT(no)
# The only reason why libstdc++ headers fail with Clang in C++11 mode is because
# they use the __float128 type that Clang doesn't know (libstdc++ checks whether
# __float128 is available during its build, but it's usually built using GCC,
# and so c++config.h hardcodes __float128 being supported). As the only place
# where __float128 is actually used is in a template specialization,
# -D__float128=void will avoid the problem there while still causing a problem
# if somebody actually uses the type.
AC_MSG_CHECKING([whether -D__float128=void workaround helps])
CXXFLAGS="$CXXFLAGS -D__float128=void"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <vector>
// some Clang fail when compiling against GCC 4.7 headers with -std=gnu++0x
// (__float128)
]])
],
[
AC_MSG_RESULT(yes)
CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -D__float128=void"
],
[
AC_MSG_RESULT(no)
HAVE_CXX11=
])
])
AC_LANG_POP([C++])