+2021-07-22 Jonathan Wakely <jwakely@redhat.com>
+
+ Backported from master:
+ 2021-04-15 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/96657
+ * libsupc++/Makefile.am: Add atomicity.cc here.
+ * src/c++98/Makefile.am: Remove it from here.
+ * libsupc++/Makefile.in: Regenerate.
+ * src/c++98/Makefile.in: Regenerate.
+ * testsuite/18_support/exception_ptr/96657.cc: New test.
+
+2021-07-22 Jonathan Wakely <jwakely@redhat.com>
+
+ Backported from master:
+ 2021-06-07 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/98842
+ * include/std/optional (operator<=>(const optional<T>& const U&)):
+ Add missing constraint and add workaround for template
+ recursion.
+ * testsuite/20_util/optional/relops/three_way.cc: Check that
+ type without equality comparison cannot be compared when wrapped
+ in std::optional.
+
2021-07-14 Jonathan Wakely <jwakely@redhat.com>
Backported from master: