[CHERI] Minor fixes to libc++ forward-merging discovered while updating cheriot-rtos.

Author: resistor

libcxx/include/__bit/rotate.h

@@ -61,12 +61,12 @@ template <__libcpp_unsigned_integer _Tp>
 }
 
 #if __has_feature(capabilities)
-template<>
-_LIBCPP_HIDE_FROM_ABI constexpr inline unsigned __intcap rotl(unsigned __intcap __t, unsigned int __cnt) noexcept {
-    // __builtin_cheri_address_set cannot be used in a constant expression (yet), so we return a null-derived integer.
-    return std::rotl(static_cast<ptraddr_t>(__t), __cnt);
+template <>
+_LIBCPP_HIDE_FROM_ABI constexpr inline unsigned __intcap rotl(unsigned __intcap __t, int __cnt) noexcept {
+  // __builtin_cheri_address_set cannot be used in a constant expression (yet), so we return a null-derived integer.
+  return std::rotl(static_cast<ptraddr_t>(__t), __cnt);
 }
-#endif
+#  endif
 
 template <__libcpp_unsigned_integer _Tp>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp rotr(_Tp __t, int __cnt) noexcept {

libcxx/include/__functional/hash.h

@@ -435,8 +435,7 @@ template <>
 struct _LIBCPP_TEMPLATE_VIS hash<__intcap_t>
     : public __unary_function<__intcap_t, size_t>
 {
-  _LIBCPP_INLINE_VISIBILITY
-  size_t operator()(__intcap_t x) const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI size_t operator()(__intcap_t x) const _NOEXCEPT {
     return hash<ptraddr_t>()(static_cast<ptraddr_t>(x));
   }
 };
@@ -445,8 +444,7 @@ template <>
 struct _LIBCPP_TEMPLATE_VIS hash<__uintcap_t>
     : public __unary_function<__uintcap_t, size_t>
 {
-  _LIBCPP_INLINE_VISIBILITY
-  size_t operator()(__uintcap_t x) const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI size_t operator()(__uintcap_t x) const _NOEXCEPT {
     return hash<ptraddr_t>()(static_cast<ptraddr_t>(x));
   }
 };

libcxx/include/__utility/convert_to_integral.h

@@ -49,11 +49,11 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __uint128_t __convert_to_integral
 #endif
 
 #if __has_feature(capabilities)
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-__intcap __convert_to_integral(__intcap __val) { return __val; }
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR __intcap __convert_to_integral(__intcap __val) { return __val; }
 
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-unsigned __intcap __convert_to_integral(unsigned __intcap __val) { return __val; }
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unsigned __intcap __convert_to_integral(unsigned __intcap __val) {
+  return __val;
+}
 #endif
 
 template <class _Tp, bool = is_enum<_Tp>::value>