[binutils-gdb] sim: fix arch Makefile regen when unified

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cc717561416185c2328e68c3ba9dd3c8331d4976

commit cc717561416185c2328e68c3ba9dd3c8331d4976
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue Jun 29 20:44:55 2021 -0400

    sim: fix arch Makefile regen when unified
    
    The $(arch) variable is only setup for cgen ports, so calculate this
    value dynamically.  We also need to generate multiple inputs in order
    to properly recreate the subdir Makefile, so list them all.

Diff:
---
 sim/common/ChangeLog      | 5 +++++
 sim/common/Make-common.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index da6511c89c9..5d86dcbe7d0 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-29  Mike Frysinger  <vapier@gentoo.org>
+
+	* Make-common.in (Makefile): Replace $(arch) and pass more files to
+	config.status.
+
 2021-06-29  Mike Frysinger  <vapier@gentoo.org>
 
 	* callback.c [!HAVE_KILL] (os_kill): Return ENOSYS.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index c203b4e1c7b..723bda589c9 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -534,7 +534,8 @@ force:
 
 Makefile: Makefile.in $(srccom)/Make-common.in $(config.status)
 @SIM_COMMON_BUILD_FALSE@	CONFIG_HEADERS= $(SHELL) ./config.status
-@SIM_COMMON_BUILD_TRUE@	cd .. && $(SHELL) ./config.status $(arch)/Makefile
+@SIM_COMMON_BUILD_TRUE@	pwd=`pwd` && subdir=`basename "$$pwd"` && cd .. && \
+@SIM_COMMON_BUILD_TRUE@		$(SHELL) ./config.status Make-common.sim $$subdir/Makefile.sim $$subdir/Makefile
 
 @SIM_COMMON_BUILD_FALSE@config.status: configure
 @SIM_COMMON_BUILD_FALSE@	$(SHELL) ./config.status --recheck