From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 9B66A385B508; Thu, 16 Mar 2023 16:51:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B66A385B508 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678985477; bh=AUtjK68QcXXhOleBaM4At0of/QW1S5xnyVk01PJ2cwE=; h=From:To:Subject:Date:From; b=wTPa8Bzx6K1Du/rs9YjxYz9TGjwaXTfInOST/OXBqtD/gKTXZLiaoHocSJkaqy63A DlRRZVRbqYnp5MDHGotSrJiGHnypqL+yPLB5mSEtVyxCMtaPQfOHBrHgPokXBErTV/ BZhtkJWGyGtcyKJI4UQ/1Bi2YWgR7GQVfhnPeC4w= 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 r11-10579] libstdc++: Fix std::random_device for avr X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: c86ac1a463f97554b1df9ef8a3e18573ef115e35 X-Git-Newrev: f99b97015f16ee3d8d4656666cd7594555fafbf9 Message-Id: <20230316165117.9B66A385B508@sourceware.org> Date: Thu, 16 Mar 2023 16:51:17 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f99b97015f16ee3d8d4656666cd7594555fafbf9 commit r11-10579-gf99b97015f16ee3d8d4656666cd7594555fafbf9 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. (cherry picked from commit 277dd6ea416718ba5493023b5a4660ecdbaf936c) 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 44b9f30e4a9..f2dc5f3021f 100644 --- a/libstdc++-v3/src/c++11/random.cc +++ b/libstdc++-v3/src/c++11/random.cc @@ -395,6 +395,7 @@ namespace std _GLIBCXX_VISIBILITY(default) } #endif +#ifdef _GLIBCXX_USE_DEV_RANDOM #ifdef USE_POSIX_FILE_IO ::close(_M_fd); _M_fd = -1; @@ -402,6 +403,7 @@ namespace std _GLIBCXX_VISIBILITY(default) std::fclose(static_cast(_M_file)); #endif _M_file = nullptr; +#endif } random_device::result_type