From: Tom Tromey <tom@tromey.com>
To: Tom Tromey <tom@tromey.com>
Cc: Simon Marchi <simon.marchi@polymtl.ca>, gdb-patches@sourceware.org
Subject: Re: [PATCH 1/3] Update create-version.sh to use common/version.h
Date: Sat, 26 Jan 2019 04:04:00 -0000 [thread overview]
Message-ID: <87pnskm5dp.fsf@tromey.com> (raw)
In-Reply-To: <87tvhwm5nr.fsf@tromey.com> (Tom Tromey's message of "Fri, 25 Jan 2019 20:58:16 -0700")
>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:
Tom> How about just copying create-version.sh to sim/common and having it use
Tom> the old #include "version.h"? Then the two scripts can evolve in their
Tom> own ways as needed, without worrying.
Like this.
Tom
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c05b535237..945a1faba2 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-25 Tom Tromey <tom@tromey.com>
+
+ * Make-common.in (version.c): Use sim's create-version.sh.
+ * create-version.sh: New file.
+
2019-01-16 Pavel I. Kryukov <kryukov@frtk.ru>
* sim-arange.c (DEFINE_INLINE_P, DEFINE_NON_INLINE_P): Remove.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index b211e16baa..1a3bcc9417 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -289,8 +289,8 @@ stamp-tvals: gentmap
$(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
touch stamp-tvals
-version.c: Makefile $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcroot)/gdb/common/create-version.sh
- $(SHELL) $(srcroot)/gdb/common/create-version.sh $(srcroot)/gdb \
+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 \
$(host_alias) $(target_alias) version.c
#
diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh
index 6e67a61357..51cffe8db5 100755
--- a/sim/common/create-version.sh
+++ b/sim/common/create-version.sh
@@ -30,7 +30,7 @@ output="$4"
rm -f version.c-tmp $output version.tmp
date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../bfd/version.h`
sed -e "s/DATE/$date/" < $srcdir/version.in > version.tmp
-echo '#include "common/version.h"' >> version.c-tmp
+echo '#include "version.h"' >> version.c-tmp
echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
echo 'const char host_name[] = "'"$host_alias"'";' >> version.c-tmp
echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 8ecdab8a77..171546734b 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-25 Tom Tromey <tom@tromey.com>
+
+ * Makefile.in (version.c): Use sim's create-version.sh.
+
2018-05-09 Sebastian Rasmussen <sebras@gmail.com>
* e500_registers.h: Comment typo fix.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 1635e01c49..fb5a6bd21e 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -548,8 +548,8 @@ $(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)/gdb/common/create-version.sh
- $(SHELL) $(srcroot)/gdb/common/create-version.sh $(srcroot)/gdb \
+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 \
$(host_alias) $(target_alias) version.c
version.o: version.c $(version_h)
next prev parent reply other threads:[~2019-01-26 4:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 17:30 [PATCH 0/3] Normalize common includes Tom Tromey
2019-01-23 17:30 ` [PATCH 2/3] Normalize includes to use common/ Tom Tromey
2019-01-23 17:30 ` [PATCH 3/3] Don't use -I for common subdirectory Tom Tromey
2019-01-25 4:17 ` [PATCH 0/3] Normalize common includes Joel Brobecker
2019-01-25 14:28 ` Tom Tromey
2019-01-25 16:47 ` John Baldwin
2019-01-25 21:32 ` Tom Tromey
[not found] ` <20190123172954.24421-2-tom@tromey.com>
2019-01-26 1:00 ` [PATCH 1/3] Update create-version.sh to use common/version.h Simon Marchi
[not found] ` <6adb597a88e229b7996d156ea8208438@polymtl.ca>
2019-01-26 3:58 ` Tom Tromey
2019-01-26 4:04 ` Tom Tromey [this message]
2019-01-26 4:41 ` Simon Marchi
2019-01-26 5:03 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pnskm5dp.fsf@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox