configure.ac | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
New commits:
commit c78d699b491a56d838ed1550c72a4f0a9507556e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jan 28 13:54:54 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jan 28 17:01:30 2020 +0100
Remove obsolete Clang <= 3.8 __float128 check
According to README.md, for Linux the baseline is Clang 5.0.2, and for
macOS and
iOS (should this libstdc++ __float128 stuff be relevant for either of them
at
all) the baseline is Xcode 9.3 which maps to ca. LLVM 5.0.2 according to
<https://en.wikipedia.org/wiki/Xcode#
Xcode_7.0_-_11.x_(since_Free_On-Device_Development)>.
Change-Id: Ibd916cff795998bc63398695be63481cfd02abcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87618
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configure.ac b/configure.ac
index b31adb15b8b5..4b25ed9bf662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6556,36 +6556,6 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
CXXFLAGS="$CXXFLAGS -DSYSTEM_LIBCMIS $LIBCMIS_CFLAGS"
fi
AC_LANG_PUSH([C++])
- dnl Clang 3.9 supports __float128 since
- dnl
<http://llvm.org/viewvc/llvm-project?view=revision&revision=268898> "Enable
support for
- dnl __float128 in Clang and enable it on pertinent platforms", but
Clang 3.8 may need a
- dnl hacky workaround to be able to include <vector> (as is done in the
main check whether
- dnl $flag is supported below, so check this first):
- my_float128hack=
- my_float128hack_impl=-D__float128=void
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <vector>
- // some Clang fail when compiling against libstdc++ headers with
-std=gnu++0x
- // (__float128)
- ]])
- ],,[
- dnl The only reason why libstdc++ headers fail with Clang in C++11
mode is because they
- dnl use the __float128 type that Clang doesn't know (libstdc++
checks whether __float128
- dnl is available during its build, but it's usually built using
GCC, and so c++config.h
- dnl hardcodes __float128 being supported). At least for some older
libstdc++, the only
- dnl place where __float128 is used is in a template
specialization, -D__float128=void
- dnl will avoid the problem there while still causing a problem if
somebody actually uses
- dnl the type. (But some later libstdc++ are known to use
__float128 also in algorithm ->
- dnl bits/stl_alog.h -> cstdlib -> bits/std_abs.h, in a way that
unfortunately cannot be
- dnl "fixed" with this hack):
- CXXFLAGS="$CXXFLAGS $my_float128hack_impl"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <vector>
- // some Clang fail when compiling against libstdc++ headers
with -std=gnu++0x
- // (__float128)
- ]])
- ],[my_float128hack=$my_float128hack_impl])
- ])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <algorithm>
#include <functional>
@@ -6607,7 +6577,7 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
void f(std::vector<int> & v, std::function<bool(int, int)> fn) {
std::sort(v.begin(), v.end(), fn);
}
- ]])],[CXXFLAGS_CXX11=$flag $my_float128hack])
+ ]])],[CXXFLAGS_CXX11=$flag])
AC_LANG_POP([C++])
CXXFLAGS=$save_CXXFLAGS
if test -n "$CXXFLAGS_CXX11"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
