From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1298) id 1C5B53858419; Mon, 13 Dec 2021 13:54:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C5B53858419 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Olivier Hainque To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5930] Include yvals.h for VxWorks < 7 RTPs as well X-Act-Checkin: gcc X-Git-Author: Olivier Hainque X-Git-Refname: refs/heads/master X-Git-Oldrev: b80e6d97a9e2425f2a8b97a436335e0abf9105db X-Git-Newrev: 55fb12f12fee7313be1d3fb965e63d4c8580eb95 Message-Id: <20211213135439.1C5B53858419@sourceware.org> Date: Mon, 13 Dec 2021 13:54:39 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Dec 2021 13:54:39 -0000 https://gcc.gnu.org/g:55fb12f12fee7313be1d3fb965e63d4c8580eb95 commit r12-5930-g55fb12f12fee7313be1d3fb965e63d4c8580eb95 Author: Olivier Hainque 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 * 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++. */