diff --git a/libcxx/include/__iterator/wrap_iter.h b/libcxx/include/__iterator/wrap_iter.h
--- a/libcxx/include/__iterator/wrap_iter.h
+++ b/libcxx/include/__iterator/wrap_iter.h
@@ -164,6 +164,13 @@
     template <class _Tp, size_t> friend class _LIBCPP_TEMPLATE_VIS span;
 };
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+    return __x.base() == __y.base();
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
@@ -171,6 +178,17 @@
     return __x.base() == __y.base();
 }
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+#if _LIBCPP_DEBUG_LEVEL == 2
+    _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
+                   "Attempted to compare incomparable iterators");
+#endif
+    return __x.base() < __y.base();
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
@@ -182,6 +200,13 @@
     return __x.base() < __y.base();
 }
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+    return !(__x == __y);
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
@@ -189,6 +214,13 @@
     return !(__x == __y);
 }
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+    return __y < __x;
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
@@ -196,6 +228,13 @@
     return __y < __x;
 }
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+    return !(__x < __y);
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
@@ -203,6 +242,13 @@
     return !(__x < __y);
 }
 
+template <class _Iter1>
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
+bool operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
+{
+    return !(__y < __x);
+}
+
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
diff --git a/libcxx/test/std/containers/iterator.rel_ops.compile.pass.cpp b/libcxx/test/std/containers/iterator.rel_ops.compile.pass.cpp
new file mode 100644
--- /dev/null
+++ b/libcxx/test/std/containers/iterator.rel_ops.compile.pass.cpp
@@ -0,0 +1,150 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// Make sure the various container's iterators are not broken by the use of `std::rel_ops`.
+
+#include <utility> // for std::rel_ops
+
+#include <array>
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+#include "test_macros.h"
+
+#if TEST_STD_VER >= 11
+#include "filesystem_include.h"
+#endif
+
+#if TEST_STD_VER >= 17
+#include <string_view>
+#endif
+
+#if TEST_STD_VER >= 20
+#include <span>
+#endif
+
+using namespace std::rel_ops;
+
+template<class Container>
+void test() {
+    Container c;
+    typename Container::iterator it = c.begin();
+    typename Container::const_iterator cit = c.begin();
+    (void)(it == it);
+    (void)(it != it);
+    (void)(it == cit);
+    (void)(it != cit);
+    (void)(cit == it);
+    (void)(cit != it);
+    (void)(cit == cit);
+    (void)(cit != cit);
+}
+
+template<class Container>
+void test_random_access() {
+    Container c;
+    typename Container::iterator it = c.begin();
+    typename Container::const_iterator cit = c.begin();
+    (void)(it == it);
+    (void)(it != it);
+    (void)(it <  it);
+    (void)(it <= it);
+    (void)(it >  it);
+    (void)(it >= it);
+    (void)(it == cit);
+    (void)(it != cit);
+    (void)(it <  cit);
+    (void)(it <= cit);
+    (void)(it >  cit);
+    (void)(it >= cit);
+    (void)(cit == it);
+    (void)(cit != it);
+    (void)(cit <  it);
+    (void)(cit <= it);
+    (void)(cit >  it);
+    (void)(cit >= it);
+    (void)(cit == cit);
+    (void)(cit != cit);
+    (void)(cit <  cit);
+    (void)(cit <= cit);
+    (void)(cit >  cit);
+    (void)(cit >= cit);
+
+    // Test the other ops too, even though std::rel_ops shouldn't affect them.
+
+    (void)(it - it);
+    (void)(it - cit);
+    (void)(cit - it);
+    (void)(cit - cit);
+
+    (void)(it + 1);
+    (void)(it - 1);
+    (void)(1 + it);
+
+    (void)(cit + 1);
+    (void)(cit - 1);
+    (void)(1 + cit);
+}
+
+template void test_random_access<std::array<int, 10> >();
+template void test_random_access<std::deque<int> >();
+template void test<std::forward_list<int> >();
+template void test<std::list<int> >();
+template void test<std::map<int, int> >();
+template void test<std::multimap<int, int> >();
+template void test<std::multiset<int> >();
+template void test<std::set<int> >();
+template void test<std::string>();
+template void test<std::unordered_map<int, int> >();
+template void test<std::unordered_multimap<int, int> >();
+template void test<std::unordered_multiset<int> >();
+template void test<std::unordered_set<int> >();
+template void test_random_access<std::vector<int> >();
+
+#if TEST_STD_VER >= 11
+void test_directory_iterators() {
+    fs::directory_iterator it;
+    fs::recursive_directory_iterator rit;
+    (void)(it == it);
+    (void)(it != it);
+    (void)(rit == rit);
+    (void)(rit != rit);
+}
+
+template void test<fs::path>();
+#endif
+
+#if TEST_STD_VER >= 17
+template void test_random_access<std::string_view>();
+#endif
+
+#if TEST_STD_VER >= 20
+void test_span() {
+    std::span<int>::iterator it;  // span has no const_iterator
+    (void)(it == it);
+    (void)(it != it);
+    (void)(it <  it);
+    (void)(it <= it);
+    (void)(it >  it);
+    (void)(it >= it);
+
+    // Test the other ops too, even though std::rel_ops shouldn't affect them.
+
+    (void)(it - it);
+    (void)(it + 1);
+    (void)(it - 1);
+    (void)(1 + it);
+}
+#endif