From 28119fba7f1a3c96dde58905277eac4de148f210 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Fri, 6 Mar 2020 09:37:55 +0100 Subject: [PATCH] libstdc++: Deal with ENOSYS == ENOTSUP zTPF uses the same numeric value for ENOSYS and ENOTSUP. libstdc++-v3/ChangeLog: 2020-03-06 Andreas Krebbel * src/c++11/system_error.cc: Omit the ENOTSUP case statement if it would match ENOSYS. --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/c++11/system_error.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8c94885ff29..644a18ad39f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2020-03-06 Andreas Krebbel + + * src/c++11/system_error.cc: Omit the ENOTSUP case statement if it + would match ENOSYS. + 2020-03-05 Jonathan Wakely * testsuite/27_io/filesystem/operations/all.cc: Mark unused variable. diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index 7844afe6d2a..1f06e67feea 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -251,7 +251,8 @@ namespace #ifdef ENOTSOCK case ENOTSOCK: #endif -#ifdef ENOTSUP +#if defined ENOTSUP && (!defined ENOSYS || ENOTSUP != ENOSYS) + // zTPF uses the same value for ENOSYS and ENOTSUP case ENOTSUP: #endif #ifdef ENOTTY -- 2.30.2