From fc36378d8a11ab1285dc93e938bf72cc773b2bd1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 2 Feb 2023 16:00:21 +0000 Subject: [PATCH] libstdc++: Use ENOSYS for unsupported filesystem ops on AVR Because avr-libc defines most error numbers with duplicate values it's not sufficient to check #ifdef ENOTSUP when deciding which std::errc constant to use for the filesystem library's __unsupported() helper. Add a special case for AVR to always use the ENOSYS value. libstdc++-v3/ChangeLog: * src/filesystem/ops-common.h [AVR] (__unsupported): Always use errc::function_not_supported instead of errc::not_supported. (cherry picked from commit 5c43f06c228d169c370e99fa009154344fa305b8) --- libstdc++-v3/src/filesystem/ops-common.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index ac17cb5fcd57..f3ca125f2caa 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -83,7 +83,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline error_code __unsupported() noexcept { -#if defined ENOTSUP +#if defined __AVR__ + // avr-libc defines ENOTSUP and EOPNOTSUPP but with nonsense values. + // ENOSYS is defined though, so use an error_code corresponding to that. + // This contradicts the comment above, but we don't have much choice. + return std::make_error_code(std::errc::function_not_supported); +#elif defined ENOTSUP return std::make_error_code(std::errc::not_supported); #elif defined EOPNOTSUPP // This is supposed to be for socket operations -- 2.47.2