public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-9100] libstdc++: Fix std::random_device for avr
Date: Thu,  2 Feb 2023 09:34:52 +0000 (GMT)	[thread overview]
Message-ID: <20230202093452.1031C3858431@sourceware.org> (raw)

https://gcc.gnu.org/g:cc0394346ac49659d446b2ef35c40ba1ef3cd117

commit r12-9100-gcc0394346ac49659d446b2ef35c40ba1ef3cd117
Author: Jonathan Wakely <jwakely@redhat.com>
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 8b5175a4ebf..38e2153ec17 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<FILE*>(_M_file));
 #endif
     _M_file = nullptr;
+#endif
   }
 
   random_device::result_type

                 reply	other threads:[~2023-02-02  9:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230202093452.1031C3858431@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).