Skip to content

Commit

Permalink
Adjust revisions and patches for LLVM 15
Browse files Browse the repository at this point in the history
  • Loading branch information
mplatings committed Oct 11, 2022
1 parent 5f5ea82 commit 142a028
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions patches/llvm-HEAD.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/libcxx/include/cmath b/libcxx/include/cmath
index 65a853165..a9cd04aa0 100644
index 4d81eed339d8..46c9b90b70e0 100644
--- a/libcxx/include/cmath
+++ b/libcxx/include/cmath
@@ -7,6 +7,9 @@
Expand All @@ -23,18 +23,18 @@ index 65a853165..a9cd04aa0 100644
template <class _A1, class _A2, class _A3>
inline _LIBCPP_INLINE_VISIBILITY
@@ -634,8 +639,10 @@ lerp(float __a, float __b, float __t) _NOEXCEPT { return __ler
_LIBCPP_HIDE_FROM_ABI constexpr double
constexpr double
lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }

+#if !(defined(__NEWLIB__) && (defined(_LDBLD_EQ_DBL) || !defined(__CYGWIN__)))
_LIBCPP_HIDE_FROM_ABI constexpr long double
constexpr long double
lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
+#endif

template <class _A1, class _A2, class _A3>
inline _LIBCPP_HIDE_FROM_ABI
diff --git a/libcxx/include/math.h b/libcxx/include/math.h
index 0ec584af9..e26b5138a 100644
index 0ec584af9dbe..e26b5138ae1b 100644
--- a/libcxx/include/math.h
+++ b/libcxx/include/math.h
@@ -7,6 +7,9 @@
Expand Down
8 changes: 4 additions & 4 deletions versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
---
SourceType: "standalone-build-scripts"
Revisions:
- Revision: HEAD
- Revision: branch-15
Modules:
- Name: llvm.git
FriendlyName: LLVM
URL: https://github.com/llvm/llvm-project.git
Branch: main
Revision: HEAD
Branch: release/15.x
Revision: llvmorg-15.0.2
Patch: llvm-HEAD.patch
- Name: picolibc.git
FriendlyName: Picolibc
URL: https://github.com/picolibc/picolibc.git
Branch: main
Revision: HEAD
Revision: 3e7c697478ecd4575056d7373ed947ded1eddf8e
Patch: picolibc-HEAD.patch

0 comments on commit 142a028

Please sign in to comment.