This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] Adapt sim to new version number & date locations.
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>, Mike Frysinger <vapier at gentoo dot org>, Anthony Green <green at moxielogic dot com>
- Date: Mon, 24 Jun 2013 16:45:46 -0700
- Subject: [commit] Adapt sim to new version number & date locations.
- References: <20130624224138 dot GC5326 at adacore dot com>
Hello,
This change is required now that gdb/version.in has been moved to
gdb/common/version.in and now that the date needs to be fetched
from bfd/version.h.
The common and ppc parts were easy to fix, by just doing a reduced
version of what we do for GDB and GDBserver. Moxie, on the other
hand, needs the version info for different reasons, and I prefered
not touching it.
sim/common/ChangeLog:
* create-version.sh: New script. Adapted from
gdb/commong/create-version.sh.
* Make-common.in (version.c): Update rule dependencies,
and re-implement using create-version.sh.
sim/ppc/ChangeLog:
* Makefile.in (srccom): New variable.
(version.c): Update rule dependencies, and re-implement using
sim/common/create-version.sh.
Tested by rebuilding the simulators, and by visually inspecting
the output (version.c file).
Checked in.
--
Joel
---
sim/common/ChangeLog | 7 +++++++
sim/common/Make-common.in | 8 ++------
sim/common/create-version.sh | 33 +++++++++++++++++++++++++++++++++
sim/ppc/ChangeLog | 6 ++++++
sim/ppc/Makefile.in | 8 +++-----
5 files changed, 51 insertions(+), 11 deletions(-)
create mode 100755 sim/common/create-version.sh
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 445a4c0..cc0e9aa 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-24 Joel Brobecker <brobecker@adacore.com>
+
+ * create-version.sh: New script. Adapted from
+ gdb/commong/create-version.sh.
+ * Make-common.in (version.c): Update rule dependencies,
+ and re-implement using create-version.sh.
+
2013-06-21 Nick Clifton <nickc@redhat.com>
* gennltvals.sh: Add msp430 support.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index af73c30..769f782 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -300,12 +300,8 @@ stamp-tvals: gentmap
$(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
touch stamp-tvals
-version.c: Makefile ../../gdb/version.in
- rm -f version.c-tmp version.c
- echo '#include "version.h"' >> version.c-tmp
- echo 'const char version[] = "'"`sed q ${srcdir}/../../gdb/version.in`"'";' >> version.c-tmp
- mv version.c-tmp version.c
-
+version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in
+ $(SHELL) $(srccom)/create-version.sh $(srccom) version.c
#
# Rules for building sim-* components. Triggered by listing the corresponding
diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh
new file mode 100755
index 0000000..aaf2ab3
--- /dev/null
+++ b/sim/common/create-version.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Copyright (C) 1989-2013 Free Software Foundation, Inc.
+
+# This file is part of GDB.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Create version.c from version.in.
+# Usage:
+# create-version.sh PATH-TO-COMMON-SIM-SRCDIR OUTPUT-FILE-NAME
+
+srcdir="$1"
+output="$2"
+
+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/../../gdb/common/version.in > version.tmp
+echo '#include "version.h"' >> version.c-tmp
+echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
+mv version.c-tmp $output
+rm -f version.tmp
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4734587..2f7da02 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-24 Joel Brobecker <brobecker@adacore.com>
+
+ * Makefile.in (srccom): New variable.
+ (version.c): Update rule dependencies, and re-implement using
+ sim/common/create-version.sh.
+
2013-05-03 Hafiz Abid Qadeer <abidh@codesourcery.com>
revert:
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index d7d6689..1652b24 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -21,6 +21,7 @@ default: all
VPATH = @srcdir@
srcdir = @srcdir@
+srccom = $(srcdir)/../common
srcroot = $(srcdir)/../..
prefix = @prefix@
@@ -562,11 +563,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 ../../gdb/version.in
- rm -f version.c-tmp version.c
- echo '#include "version.h"' >> version.c-tmp
- echo 'const char version[] = "'"`sed q ${srcdir}/../../gdb/version.in`"'";' >> version.c-tmp
- mv version.c-tmp version.c
+version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in
+ $(SHELL) $(srccom)/create-version.sh $(srccom) version.c
version.o: version.c $(version_h)
psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
--
1.7.10.4