diff options
| author | Olivier Hainque <hainque@adacore.com> | 2021-11-28 15:21:25 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@adacore.com> | 2021-12-09 15:54:50 +0000 |
| commit | 6a0f6018ba41658b9b85ad82ed1bd748754f3eca (patch) | |
| tree | ac4da9a412e75486d639e0155637acbed645fb45 /gcc/Makefile.in | |
| parent | 0d5db1dd65b45286082f82f600ca0a3e6e43e06e (diff) | |
| download | gcc-6a0f6018ba41658b9b85ad82ed1bd748754f3eca.zip gcc-6a0f6018ba41658b9b85ad82ed1bd748754f3eca.tar.gz gcc-6a0f6018ba41658b9b85ad82ed1bd748754f3eca.tar.bz2 | |
Provide vxworks alternate stdint.h during the build
This change arranges to provide the vxworks alternate stdint.h
at build time instead of at install time, so it is used instead
of the system one while building the libraries.
This is a lot more consistent and helps the build on configurations
where the system does not come with stdint.h at all.
The change uses a similar mechanism as the one previsouly introduced
for glimits.h and takes the opportunity to simplify the glimits.h
command to use an automatic variable.
This introduces an indirect dependency on the VxWorks version.h
for vxcrtstuff objects, for which we then need to apply the same
tricks as for libgcc2 regarding include paths (to select the system
header instead of the gcc one).
2021-02-12 Olivier Hainque <hainque@adacore.com>
Rasmus Villemoes <rv@rasmusvillemoes.dk>
gcc/
* Makefile.in (T_STDINT_GCC_H): New variable, path to
stdint-gcc.h that a target configuration may override when
use_gcc_stdint is "provide".
(stmp-int-hdrs): Depend on it and copy that for
USE_GCC_INT=provide.
* config.gcc (vxworks): Revert to use_gcc_stdint=provide.
* config/t-vxworks (T_STDINT_GCC_H): Define, as vxw-stdint-gcc.h.
(vxw-stdint-gcc.h): New target, produced from the original
stdint-gcc.h.
(vxw-glimits.h): Use an automatic variable to designate the
first and only prerequisite.
* config/vxworks/stdint.h: Remove.
libgcc/
* config/t-vxworks: Set CRTSTUFF_T_CFLAGS to
$(LIBGCC2_INCLUDES).
* config/t-vxworks7: Likewise.
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2a0be9e..41949f0 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -452,6 +452,7 @@ USER_H_INC_NEXT_POST = @user_headers_inc_next_post@ # Enable target overriding of this fragment, as in config/t-vxworks. T_GLIMITS_H = $(srcdir)/glimits.h +T_STDINT_GCC_H = $(srcdir)/ginclude/stdint-gcc.h # The GCC to use for compiling crt*.o. # Usually the one we just built. @@ -3099,7 +3100,7 @@ gcov-tool$(exeext): $(GCOV_TOOL_OBJS) $(LIBDEPS) # be rebuilt. # Build the include directories. -stmp-int-hdrs: $(STMP_FIXINC) $(T_GLIMITS_H) $(USER_H) fixinc_list +stmp-int-hdrs: $(STMP_FIXINC) $(T_GLIMITS_H) $(T_STDINT_GCC_H) $(USER_H) fixinc_list # Copy in the headers provided with gcc. # # The sed command gets just the last file name component; @@ -3145,7 +3146,7 @@ stmp-int-hdrs: $(STMP_FIXINC) $(T_GLIMITS_H) $(USER_H) fixinc_list cp $(srcdir)/ginclude/stdint-wrap.h include/stdint.h; \ chmod a+r include/stdint.h; \ elif [ $(USE_GCC_STDINT) = provide ]; then \ - cp $(srcdir)/ginclude/stdint-gcc.h include/stdint.h; \ + cp $(T_STDINT_GCC_H) include/stdint.h; \ chmod a+r include/stdint.h; \ fi set -e; for ml in `cat fixinc_list`; do \ |