Merge commit 'f3f6ff7b16861cd0651eccff14689536550762ae^' into HEAD

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile.def
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc contrib/mklog.py
Simple merge

diff --cc gcc/Makefile.in
index a0fec5decc09a08d833b09534408dd55579daa9c,5930b52462aab28aee658d7aee1aa7fcd76f4c63..675b685522b695cfcf667adb0b138e7a8c24c066
--- 1/gcc/Makefile.in
--- 2/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@@ -895,9 -895,9 +897,10 @@@ 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)
 +TM_RUST_H = tm_rust.h $(tm_rust_file_list)
  GTM_H     = tm.h      $(tm_file_list) insn-constants.h
  TM_H      = $(GTM_H) insn-flags.h $(OPTIONS_H)
  
@@@ -3032,12 -3005,11 +3036,12 @@@ build/genrecog.o : genrecog.cc $(RTL_BA
    $(CORETYPES_H) $(GTM_H) errors.h $(READ_MD_H) $(GENSUPPORT_H)               \
    $(HASH_TABLE_H) inchash.h
  build/genhooks.o : genhooks.cc $(TARGET_DEF) $(C_TARGET_DEF)          \
 -  $(COMMON_TARGET_DEF) $(D_TARGET_DEF) $(BCONFIG_H) $(SYSTEM_H) errors.h
 +  $(COMMON_TARGET_DEF) $(D_TARGET_DEF) $(RUST_TARGET_DEF) $(BCONFIG_H) \
 +  $(SYSTEM_H) errors.h
  build/genmddump.o : genmddump.cc $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H)       \
    $(CORETYPES_H) $(GTM_H) errors.h $(READ_MD_H) $(GENSUPPORT_H)
- build/genmatch.o : genmatch.cc $(BCONFIG_H) $(SYSTEM_H) \
-   $(CORETYPES_H) errors.h $(HASH_TABLE_H) hash-map.h $(GGC_H) is-a.h \
+ build/genmatch.o : genmatch.cc $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \
+   errors.h $(HASH_TABLE_H) hash-map.h $(GGC_H) is-a.h ordered-hash-map.h \
    tree.def builtins.def internal-fn.def case-cfn-macros.h $(CPPLIB_H)
  build/gencfn-macros.o : gencfn-macros.cc $(BCONFIG_H) $(SYSTEM_H)     \
    $(CORETYPES_H) errors.h $(HASH_TABLE_H) hash-set.h builtins.def     \

diff --cc gcc/config.gcc
Simple merge

diff --cc gcc/configure
Simple merge

diff --cc gcc/configure.ac
Simple merge

diff --cc gcc/doc/tm.texi
Simple merge

diff --cc gcc/doc/tm.texi.in
Simple merge