sim: switch to gdb version script

Since the local create-version.sh already points directly into the gdb
source tree, we might as well use the gdb script directly too.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index bf7807c7c11dc5de80a7c527b8ec5b19878a97c2..00a952eeb33adbe9ffa6d143ee215cfd88b3b4d8 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (version.o): Change to using create-version.sh from gdb.
+       (create-version.sh): Delete.
+
 2015-04-06  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (SIM_NEW_COMMON_OBJS): Add sim-engine.o and sim-hrw.o.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 50db255c2eb99251e21e1afbd2e3b930dc65843f..d42fea610310a0dbf11f3f01381e11e838534fd2 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -304,8 +304,9 @@ stamp-tvals: gentmap
        $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
        touch stamp-tvals
 
-version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in
-       $(SHELL) $(srccom)/create-version.sh $(srcsim) $(host_alias) $(target_alias) version.c
+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 \
+           $(host_alias) $(target_alias) 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
deleted file mode 100755 (executable)
index 84a6577..0000000
--- a/sim/common/create-version.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 1989-2015 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 $1/../gdb/version.in.
-# Please keep the same API as $1/../gdb/common/create-version.sh so
-# they can be called the same way, from e.g. $srcroot/src-release.
-# Usage:
-#    create-version.sh PATH-TO-SIM-SRCDIR HOST_ALIAS \
-#        TARGET_ALIAS OUTPUT-FILE-NAME
-
-srcdir="$1"
-host_alias="$2"
-target_alias="$3"
-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/../gdb/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