From 1d28a854b0a5c1d008ee0dcbed7b047a9892fba4 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Mon, 30 Dec 2019 21:55:47 +0000 Subject: [PATCH] Add missing files expected with rev 279784 * config/vxworks/_yvals.h: New file. * config/vxworks/_yvals-wrapper.h: New file. * config/vxworks/math.h: Use it to wrap the VxWorks math.h header. * config/vxworks/complex.h: Likewise. * config/vxworks/setjmp.h: Likewise. * config/vxworks/inttypes.h: Likewise. From-SVN: r279787 --- 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 ++++++++++++++++++++++ 6 files changed, 207 insertions(+) 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/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 -- 2.30.2