public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Olivier Hainque <hainque@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-5930] Include yvals.h for VxWorks < 7 RTPs as well
Date: Mon, 13 Dec 2021 13:54:39 +0000 (GMT)	[thread overview]
Message-ID: <20211213135439.1C5B53858419@sourceware.org> (raw)

https://gcc.gnu.org/g:55fb12f12fee7313be1d3fb965e63d4c8580eb95

commit r12-5930-g55fb12f12fee7313be1d3fb965e63d4c8580eb95
Author: Olivier Hainque <hainque@adacore.com>
Date:   Mon Dec 13 08:06:46 2021 +0000

    Include yvals.h for VxWorks < 7 RTPs as well
    
    For -mrtp on VxWorks 6.9, at least inttypes.h ends up #including
    system headers checking that _BITS_BYTES is 8, which the system yvals.h
    defines. We do pre-include _yvals.h ahead of inttypes.h for this kind of
    purpose, but it currently assumes that only VxWorks >= 7 provides yvals.h.
    
    This results in unexpected configure checks failures, complaining about
    _BITS_BYTES not being 8, spotted while inspecting libstdc++ config.log for
    unrelated reasons.
    
    This change relaxes the guard in _yvals.h to include yvals.h for
    __RTP__ in addition to version >= 7.
    
    2021-12-13  Olivier Hainque  <hainque@adacore.com>
    
            * config/vxworks/_yvals.h: #include yvals.h also if
            defined(__RTP__).

Diff:
---
 gcc/config/vxworks/_yvals.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/config/vxworks/_yvals.h b/gcc/config/vxworks/_yvals.h
index f8b0818185c..0f277e42079 100644
--- a/gcc/config/vxworks/_yvals.h
+++ b/gcc/config/vxworks/_yvals.h
@@ -24,7 +24,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 #include <_vxworks-versions.h>
 
-#if _VXWORKS_MAJOR_GE(7)
+/* #include the VxWorks yvals.h in setups we expect it to be available.
+   It is around for both kernel mode and rtps on VxWorks >= 7, only for
+   rtps prior to that.  */
+
+#if _VXWORKS_MAJOR_GE(7) || defined(__RTP__)
 
 /* We need to deactivate the definitions tailored for the Dinkumware
    intrinsics, incompatible with a compilation by G++.  */


                 reply	other threads:[~2021-12-13 13:54 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=20211213135439.1C5B53858419@sourceware.org \
    --to=hainque@gcc.gnu.org \
    --cc=gcc-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).