From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id ED089385828E; Wed, 1 Feb 2023 21:07:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED089385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675285624; bh=SJ6j7e6nGnGRPqhRKGGRuGB9S9wp9h94asmLOMDy6Ig=; h=From:To:Subject:Date:From; b=Z3vPFPekb61icGm0CCgrlG/+pltDmFjmv1AnoNElu3LeDQyU9Qj2HYQpP8U6V8NUD L4mEw5SE84GEXx5f/zoKNmFeRylW1sczhZS2Eg5YWGlQzOnwvNc3fo1iWXA5UPY1Hz uNLOVkG+aRhYqZGGwjS3zsAve+rFnxYdYQev+AQQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5639] libstdc++: Fix std::random_device for avr X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 2d2e163d12f64a5e68f9e0381751ed9d5d6d3617 X-Git-Newrev: 277dd6ea416718ba5493023b5a4660ecdbaf936c Message-Id: <20230201210704.ED089385828E@sourceware.org> Date: Wed, 1 Feb 2023 21:07:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:277dd6ea416718ba5493023b5a4660ecdbaf936c commit r13-5639-g277dd6ea416718ba5493023b5a4660ecdbaf936c Author: Jonathan Wakely Date: Tue Jan 31 22:28:16 2023 +0000 libstdc++: Fix std::random_device for avr This fixes a build failure that affects avr, but could affect other targets in theory. The _M_fini function should not try to use ::open or ::fopen if _GLIBCXX_USE_DEV_RANDOM is not defined, because no file can ever have been opened. libstdc++-v3/ChangeLog: * src/c++11/random.cc (random_device::_M_fini): Do not try to close the file handle if the target doesn't support the /dev/random and /dev/urandom files. Diff: --- libstdc++-v3/src/c++11/random.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/src/c++11/random.cc b/libstdc++-v3/src/c++11/random.cc index 9872e28b29d..ed2db4aef57 100644 --- a/libstdc++-v3/src/c++11/random.cc +++ b/libstdc++-v3/src/c++11/random.cc @@ -548,6 +548,7 @@ namespace std _GLIBCXX_VISIBILITY(default) } #endif +#ifdef _GLIBCXX_USE_DEV_RANDOM #ifdef USE_POSIX_FILE_IO ::close(_M_fd); _M_fd = -1; @@ -555,6 +556,7 @@ namespace std _GLIBCXX_VISIBILITY(default) std::fclose(static_cast(_M_file)); #endif _M_file = nullptr; +#endif } random_device::result_type