Merge commit '84110515b93' into devel/c++-modules

author Nathan Sidwell <nathan@acm.org>

Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)

committer Nathan Sidwell <nathan@acm.org>

Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)
author Nathan Sidwell <nathan@acm.org>
Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)
committer Nathan Sidwell <nathan@acm.org>
Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)
diff --cc gcc/configure
Simple merge
diff --cc gcc/configure.ac
Simple merge
diff --cc gcc/cp/Make-lang.in
Simple merge
diff --cc gcc/cp/decl.c
Simple merge
diff --cc gcc/diagnostic.c
Simple merge
diff --cc gcc/gcc.c
Simple merge
diff --cc libcody/resolver.cc
Simple merge
author	Nathan Sidwell <nathan@acm.org>
	Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)
committer	Nathan Sidwell <nathan@acm.org>
	Wed, 3 Feb 2021 14:48:16 +0000 (06:48 -0800)
		1	2
gcc/configure	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/cp/Make-lang.in	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/cp/decl.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/diagnostic.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/gcc.c	patch \|	diff1 \|	diff2 \|	blob \| history
libcody/resolver.cc	patch \|	diff1 \|	diff2 \|	blob \| history