diff options
| author | Kewen Lin <linkw@linux.ibm.com> | 2023-08-18 05:03:40 -0500 |
|---|---|---|
| committer | Kewen Lin <linkw@linux.ibm.com> | 2023-08-18 05:03:40 -0500 |
| commit | 8353b9c5f5af0e65cb04fcbb7325d6a566006cd4 (patch) | |
| tree | 98e4c0b31fbf000bf6ca838d36a5e60277092e4a /gcc | |
| parent | ac8d3c7c5cd210bef20195346864307660cfa950 (diff) | |
| download | gcc-8353b9c5f5af0e65cb04fcbb7325d6a566006cd4.zip gcc-8353b9c5f5af0e65cb04fcbb7325d6a566006cd4.tar.gz gcc-8353b9c5f5af0e65cb04fcbb7325d6a566006cd4.tar.bz2 | |
Makefile.in: Make TM_P_H depend on $(TREE_H) [PR111021]
As PR111021 shows, the below ${port}-protos.h include tree.h
for code_helper and tree_code:
arm/arm-protos.h:#include "tree.h"
cris/cris-protos.h:#include "tree.h" (H-P removed this in r14-3218)
microblaze/microblaze-protos.h:#include "tree.h"
rl78/rl78-protos.h:#include "tree.h"
stormy16/stormy16-protos.h:#include "tree.h"
, when compiling build/gencondmd.cc, the include hierarchy
makes it depend on tm_p.h -> ${port}-protos.h -> tree.h,
which further includes (depends on) some files that are
generated during the building, such as: all-tree.def,
tree-check.h and so on. The previous commit r14-3215
should already force build/gencondmd.cc to depend on
${TREE_H}, so the reported build failure should be gone.
But for a long term maintenance, especially one day some
build/xxx.cc requires tm_p.h but not recog.h, the ${TREE_H}
dependence could be missed and a build failure will show
up. So this patch is to make TM_P_H depend on $(TREE_H),
any new build/xxx.cc depending on tm_p.h will be able to
consider ${TREE_H}.
It's tested with cross-builds for the affected ports with
steps:
1) dropped the fix r14-3215;
2) reproduced the build failure with serial build;
3) applied this patch, serial built and verified all passed;
4) added back r14-3215, serial built and verified all passed;
PR bootstrap/111021
gcc/ChangeLog:
* Makefile.in (TM_P_H): Add $(TREE_H) as dependence.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index a00dad9..5f4dc48 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -894,7 +894,8 @@ OPTIONS_C_EXTRA = $(PRETTY_PRINT_H) BCONFIG_H = bconfig.h $(build_xm_file_list) CONFIG_H = config.h $(host_xm_file_list) TCONFIG_H = tconfig.h $(xm_file_list) -TM_P_H = tm_p.h $(tm_p_file_list) +# Some $(target)-protos.h depends on tree.h +TM_P_H = tm_p.h $(tm_p_file_list) $(TREE_H) TM_D_H = tm_d.h $(tm_d_file_list) GTM_H = tm.h $(tm_file_list) insn-constants.h TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) |