* 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
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+/* 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
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+#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 <yvals.h>
+
+#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 */
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+#ifndef __GCC_COMPLEX_H
+#define __GCC_COMPLEX_H
+
+#define __HEADER_TO_WRAP <complex.h>
+#include <_yvals-wrapper.h>
+
+#endif
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+#ifndef __GCC_INTTYPES_H
+#define __GCC_INTTYPES_H
+
+#define __HEADER_TO_WRAP <inttypes.h>
+#include <_yvals-wrapper.h>
+
+#endif
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+#ifndef __GCC_MATH_H
+#define __GCC_MATH_H
+
+#define __HEADER_TO_WRAP <math.h>
+#include <_yvals-wrapper.h>
+
+#endif
--- /dev/null
+/* 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
+<http://www.gnu.org/licenses/>. */
+
+#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 <setjmp.h>
+
+#endif
projects / gcc.git / commitdiff