[binutils-gdb] sim: ppc: use common version.o too

[Michael Frysinger]

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

commit 92a3f613632902b6ccb2b285d6f21b89cc9e1f6b
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun Jun 13 21:35:05 2021 -0400

    sim: ppc: use common version.o too
    
    The common version.o we're building can be used for the ppc subdir,
    so switch it over too.

Diff:
---
 sim/ppc/ChangeLog   |  6 ++++++
 sim/ppc/Makefile.in | 11 ++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 2b1b2e8a31b..e2232a59d21 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (COMMON_OBJS_NAMES, +COMMON_OBJS): New variables.
+	(LIB_OBJ): Replace version.o with $(COMMON_OBJS).
+	(version.c, version.o): Delete rules.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in: Add $(EXEEXT) to run and psim.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index af9695d23f0..0814a34fbc3 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -493,6 +493,9 @@ MAIN_SRC = \
 	gdb-sim.c \
 	sim_calls.c
 
+COMMON_OBJS_NAMES = \
+	version.o
+COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%)
 
 # NOTE: semantics, idecode and psim put last so smaller files are compiled
 #       first
@@ -527,7 +530,7 @@ LIB_OBJ = \
 	support.o \
 	@sim_fpu@ \
 	psim.o \
-	version.o \
+	$(COMMON_OBJS) \
 	$(PACKAGE_OBJ) \
 	$(HW_OBJ) \
 	options.o
@@ -554,12 +557,6 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ)
 	$(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
 	$(RANLIB) $(TARGETLIB)
 
-version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/sim/common/create-version.sh
-	$(SHELL) $(srcroot)/sim/common/create-version.sh $(srcroot)/gdb $@.tmp
-	$(SHELL) $(srcroot)/move-if-change $@.tmp $@
-	touch $@
-version.o: version.c $(version_h)
-
 psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
 
 bits.o: bits.c $(BASICS_H)