diff options
| author | Olivier Hainque <hainque@adacore.com> | 2019-12-30 22:16:37 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@gcc.gnu.org> | 2019-12-30 22:16:37 +0000 |
| commit | bbbc05957e55777805cef2d7ea39f1a73604c91a (patch) | |
| tree | f744cc96d2d499bc85a6853969c8b40a9da82506 /gcc/config.gcc | |
| parent | 9905fec4d901d9d9caac74795758e021ef39c25b (diff) | |
| download | gcc-bbbc05957e55777805cef2d7ea39f1a73604c91a.zip gcc-bbbc05957e55777805cef2d7ea39f1a73604c91a.tar.gz gcc-bbbc05957e55777805cef2d7ea39f1a73604c91a.tar.bz2 | |
Arrange to preinclude yvals.h ahead of stdint on VxWorks 7
On Vxworks 7, includers of stdint.h (which we currently "provide")
need yvals.h to have been included ahead.
Instead of altering the common stdint-gcc.h with unpleasant
vxworks specific bits to do that, we arrange to provide stdint-gcc.h
on its own along with a stdint.h wrapper which preincludes yvals.h
on vx7 then includes stdint-gcc.h.
2019-12-30 Olivier Hainque <hainque@adacore.com>
* config/vxworks/stdint.h: New file. Include _yvals.h
then stdint-gcc.h.
* config/t-vxworks: Arrange to install the stdint.h wrapper.
* config.gcc (*-*-vxworks*): Add stdint-gcc.h to $extra_headers
so it gets copied. Set use_gcc_stdint to request _not_ crafting
stdint.h through the common Makefile rules.
From-SVN: r279791
Diffstat (limited to 'gcc/config.gcc')
| -rw-r--r-- | gcc/config.gcc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index 42e4251..8c2ff9a 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -962,9 +962,6 @@ case ${target} in extra_headers="${extra_headers} ../vxworks/vxworks-predef.h" target_has_targetcm="yes" - use_gcc_stdint=provide - tm_file="${tm_file} vxworks-stdint.h" - # This private header exposes a consistent interface for checks on # the VxWorks version our runtime header files need to perform, based on # what the system headers adverstise: @@ -982,6 +979,17 @@ case ${target} in extra_headers="${extra_headers} ../vxworks/math.h ../vxworks/complex.h" extra_headers="${extra_headers} ../vxworks/inttypes.h ../vxworks/setjmp.h" + # We provide stdint.h ... + + tm_file="${tm_file} vxworks-stdint.h" + + # .. only through the yvals conditional wrapping mentioned above + # to abide by the VxWorks 7 expectations. The final copy is performed + # explicitly by a t-vxworks Makefile rule. + + use_gcc_stdint=none + extra_headers="${extra_headers} ../../ginclude/stdint-gcc.h" + case ${enable_threads} in no) ;; "" | yes | vxworks) thread_file='vxworks' ;; |