diff options
| author | Dan Lipsa <dan.lipsa@kitware.com> | 2019-12-11 15:03:57 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-12-11 14:03:57 -0600 |
| commit | 6f7a58b142cf30ffdc8bff074742d4f658ab3e2f (patch) | |
| tree | aec621bfe74fcd71c2043bb5818ed0c7bef0c0b8 /var | |
| parent | 69a91b5b6b305ffb0d8d2d2ce1a15616ee88bdef (diff) | |
| download | spack-6f7a58b142cf30ffdc8bff074742d4f658ab3e2f.tar.gz spack-6f7a58b142cf30ffdc8bff074742d4f658ab3e2f.tar.bz2 spack-6f7a58b142cf30ffdc8bff074742d4f658ab3e2f.tar.xz spack-6f7a58b142cf30ffdc8bff074742d4f658ab3e2f.zip | |
Fix constexpr for llvm 9.0 (#14095)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/constexpr_longdouble_9.0.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/constexpr_longdouble_9.0.patch b/var/spack/repos/builtin/packages/llvm/constexpr_longdouble_9.0.patch new file mode 100644 index 0000000000..bbc5ab7385 --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm/constexpr_longdouble_9.0.patch @@ -0,0 +1,12 @@ +-- a/libcxx/include/thread ++++ b/libcxx/include/thread +@@ -370,7 +370,7 @@ sleep_for(const chrono::duration<_Rep, _Period>& __d) + using namespace chrono; + if (__d > duration<_Rep, _Period>::zero()) + { +-#if defined(_LIBCPP_COMPILER_GCC) && (__powerpc__ || __POWERPC__) ++#if ! (defined(_LIBCPP_COMPILER_GCC) && (__powerpc__ || __POWERPC__)) + // GCC's long double const folding is incomplete for IBM128 long doubles. + _LIBCPP_CONSTEXPR duration<long double> _Max = nanoseconds::max(); + #else + diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 97c4a57b2c..6307eab58a 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -197,6 +197,7 @@ class Llvm(CMakePackage): # see https://bugs.llvm.org/show_bug.cgi?id=39696 # for a bug report about this problem in llvm master. patch('constexpr_longdouble.patch', when='@6:8+libcxx') + patch('constexpr_longdouble_9.0.patch', when='@9+libcxx') # Backport from llvm master; see # https://bugs.llvm.org/show_bug.cgi?id=38233 |