From patchwork Fri Dec 13 16:35:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1209284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515909-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="G49PK0x/"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ZGW43swXz9sPc for ; Sat, 14 Dec 2019 03:35:42 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:subject:date:message-id:cc:to:mime-version; q=dns; s=default; b=HZHUgJNMPU+FI4H2k8IywQgcaR2Zm1h7LBJZ2X0YC47MtV+6IO MNawou4cpkWwmQ2hJbX86JJBxpbAEiYiAdws5AtFqcEEsr+wdBnN5s48pn2YPEQ4 IuOUbCA6nANa6qZdOOxs1rogHtjbahkj8vDwJ3qEJqAgA1ezs3xBd4OGs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:subject:date:message-id:cc:to:mime-version; s= default; bh=RVy8FZNSbjElb9DEPA4oVcOioto=; b=G49PK0x/4xfocFqWui6e yXOBWkumJ92xzakRrz8ps3v5Al6YxRfPegbsu2hGuyvpsAeaoBlkUc0USBmPH268 rX422nXR1GOfG912oc6Of+4HbNknY2a4O2zkyUizzTsdLNXJjU5jKkqJBOV9L+lz P4WR6q3W7fOU+LZohVj9rH0= Received: (qmail 118253 invoked by alias); 13 Dec 2019 16:35:34 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 118242 invoked by uid 89); 13 Dec 2019 16:35:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=perception X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Dec 2019 16:35:31 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 4DF6F81393; Fri, 13 Dec 2019 17:35:29 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YFSg7px8pmbq; Fri, 13 Dec 2019 17:35:29 +0100 (CET) Received: from [IPv6:2a02:2ab8:224:100::1002] (unknown [IPv6:2a02:2ab8:224:100::1002]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 2301D81390; Fri, 13 Dec 2019 17:35:27 +0100 (CET) From: Olivier Hainque Subject: [patch] Setup system header wrappers for C++ on VxWorks Date: Fri, 13 Dec 2019 17:35:25 +0100 Message-Id: <137EEBA0-A22B-4ECA-A975-F4071F44D6F1@adacore.com> Cc: Olivier Hainque , =?utf-8?b?SsOpcsO0bWUgTGFtYm91?= =?utf-8?q?rg?= , Joel Brobecker To: GCC Patches Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Starting from VxWorks 7, the system comes with a Dinkumware environment which requires the inclusion of "yvals.h" before other system headers. We provide wrapped versions of a few headers to accommodate such constraints. Initially proposed by Jérôme, this helps fix dozens of build issues when activating libstdc++ on such environments. Tested in accordance with the description in https://gcc.gnu.org/ml/gcc-patches/2019-12/msg00911.html Committing soon to mainline. Olivier 2019-12-13 Jerome Lambourg Olivier Hainque gcc/ * config/vxworks/_yvals.h: New file. * config/vxworks/_yvals-wrapper.h: New file. * gcc/config/vxworks/math.h: Use it to wrap the VxWorks math.h header. * gcc/config/vxworks/complex.h: Likewise. * gcc/config/vxworks/setjmp.h: Likewise. * gcc/config/vxworks/inttypes.h: Likewise. * config.gcc (*-*-vxworks*): Add system header wrappers to extra_headers. (powerpc-*-vxworks*): Reuse the common extra_headers. gcc/config.gcc | 16 +++++++++- gcc/config/vxworks/_yvals-wrapper.h | 44 ++++++++++++++++++++++++++++ gcc/config/vxworks/_yvals.h | 45 +++++++++++++++++++++++++++++ gcc/config/vxworks/complex.h | 28 ++++++++++++++++++ gcc/config/vxworks/inttypes.h | 28 ++++++++++++++++++ gcc/config/vxworks/math.h | 28 ++++++++++++++++++ gcc/config/vxworks/setjmp.h | 34 ++++++++++++++++++++++ 7 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 gcc/config/vxworks/_yvals-wrapper.h create mode 100644 gcc/config/vxworks/_yvals.h create mode 100644 gcc/config/vxworks/complex.h create mode 100644 gcc/config/vxworks/inttypes.h create mode 100644 gcc/config/vxworks/math.h create mode 100644 gcc/config/vxworks/setjmp.h diff --git a/gcc/config.gcc b/gcc/config.gcc index b09a3656be8..4790247a868 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -953,12 +953,15 @@ case ${target} in *-*-vxworks*) tmake_file=t-vxworks xm_defines=POSIX + extra_options="${extra_options} vxworks.opt" extra_objs="$extra_objs vxworks.o" + c_target_objs="${c_target_objs} vxworks-c.o" cxx_target_objs="${cxx_target_objs} vxworks-c.o" extra_headers="${extra_headers} ../vxworks/vxworks-predef.h" target_has_targetcm="yes" + use_gcc_stdint=provide tm_file="${tm_file} vxworks-stdint.h" @@ -968,6 +971,17 @@ case ${target} in extra_headers="${extra_headers} ../vxworks/_vxworks-versions.h" + # Starting from VxWorks 7, the system comes with a Dinkumware + # environment which requires the inclusion of "yvals.h" before other + # system headers. We provide wrapped versions of a few headers to + # accomodate such constraints: + + extra_headers="${extra_headers} ../vxworks/_yvals.h" + extra_headers="${extra_headers} ../vxworks/_yvals-wrapper.h" + + extra_headers="${extra_headers} ../vxworks/math.h ../vxworks/complex.h" + extra_headers="${extra_headers} ../vxworks/inttypes.h ../vxworks/setjmp.h" + case ${enable_threads} in no) ;; "" | yes | vxworks) thread_file='vxworks' ;; @@ -2918,7 +2932,7 @@ powerpc-wrs-vxworks*) tm_file="${tm_file} elfos.h gnu-user.h freebsd-spec.h rs6000/sysv4.h" tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks" extra_options="${extra_options} rs6000/sysv4.opt" - extra_headers=ppc-asm.h + extra_headers="${extra_headers} ppc-asm.h" case ${target} in *-vxworksmils*) tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/vxworksmils.h" diff --git a/gcc/config/vxworks/_yvals-wrapper.h b/gcc/config/vxworks/_yvals-wrapper.h new file mode 100644 index 00000000000..e7b84c2174d --- /dev/null +++ b/gcc/config/vxworks/_yvals-wrapper.h @@ -0,0 +1,44 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +/* The VxWorks 7 environment for C++ is based on a Dinkumware toolchain, + where quite a few configuration parameters are exposed in a yvals.h header + file which needs to be included before other standard headers. + + This header file provides a wrapper facility to achieve this in addition + to the common requirement to include vxWorks.h before anything else. */ + +#include <_vxworks-versions.h> + +#if _VXWORKS_MAJOR_GE(7) && defined(__cplusplus) + +#include <_yvals.h> + +#pragma push_macro("__cplusplus") +#undef __cplusplus +#include_next __HEADER_TO_WRAP +#pragma pop_macro("__cplusplus") + +#else + +#include_next __HEADER_TO_WRAP + +#endif diff --git a/gcc/config/vxworks/_yvals.h b/gcc/config/vxworks/_yvals.h new file mode 100644 index 00000000000..f8b0818185c --- /dev/null +++ b/gcc/config/vxworks/_yvals.h @@ -0,0 +1,45 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __GCC_YVALS_H +#define __GCC_YVALS_H + +#include <_vxworks-versions.h> + +#if _VXWORKS_MAJOR_GE(7) + +/* We need to deactivate the definitions tailored for the Dinkumware + intrinsics, incompatible with a compilation by G++. */ + +#include + +#undef _HAS_CPP17 +#define _HAS_CPP17 0 + +#undef _HAS_CPP14 +#define _HAS_CPP14 0 + +#undef _HAS_CPP11 +#define _HAS_CPP11 0 + +#endif /* VxWorks MAJOR >= 7 */ + +#endif /* __GCC_YVALS_H */ diff --git a/gcc/config/vxworks/complex.h b/gcc/config/vxworks/complex.h new file mode 100644 index 00000000000..394671a8b49 --- /dev/null +++ b/gcc/config/vxworks/complex.h @@ -0,0 +1,28 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __GCC_COMPLEX_H +#define __GCC_COMPLEX_H + +#define __HEADER_TO_WRAP +#include <_yvals-wrapper.h> + +#endif diff --git a/gcc/config/vxworks/inttypes.h b/gcc/config/vxworks/inttypes.h new file mode 100644 index 00000000000..d7862a48253 --- /dev/null +++ b/gcc/config/vxworks/inttypes.h @@ -0,0 +1,28 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __GCC_INTTYPES_H +#define __GCC_INTTYPES_H + +#define __HEADER_TO_WRAP +#include <_yvals-wrapper.h> + +#endif diff --git a/gcc/config/vxworks/math.h b/gcc/config/vxworks/math.h new file mode 100644 index 00000000000..8cf31b477ba --- /dev/null +++ b/gcc/config/vxworks/math.h @@ -0,0 +1,28 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __GCC_MATH_H +#define __GCC_MATH_H + +#define __HEADER_TO_WRAP +#include <_yvals-wrapper.h> + +#endif diff --git a/gcc/config/vxworks/setjmp.h b/gcc/config/vxworks/setjmp.h new file mode 100644 index 00000000000..c625e612948 --- /dev/null +++ b/gcc/config/vxworks/setjmp.h @@ -0,0 +1,34 @@ +/* This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __GCC_SETJMP_H +#define __GCC_SETJMP_H + +/* Getting proper namespaces for c++ requires that don't alter the perception + that we are compiling for c++, unlike what _yvals-wrapper would do. + setjmp.h redoes a few of a the yvals.h things in its own fashion, so the + pre-inclusion of yvals.h on VxWorks 7 with __cplusplus defined isn't a + problem in this particular case. */ + +#include <_yvals.h> +#include_next + +#endif