diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-04-10 19:40:54 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-13 02:32:58 -0400 |
| commit | 8c32ba22334b8be1c2cf412a789deeded786e1f5 (patch) | |
| tree | cb6455c163005ca3d1a92b0faa6848c2dd55b53d | |
| parent | 64f14c970716647f0761e921141873c75071100f (diff) | |
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.
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 5 | ||||
| -rwxr-xr-x | sim/common/create-version.sh | 38 |
3 files changed, 8 insertions, 40 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index bf7807c7c1..00a952eeb3 100644 --- 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 50db255c2e..d42fea6103 100644 --- 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 index 84a6577bf5..0000000000 --- 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 |