diff options
| author | Tom Tromey <tom@tromey.com> | 2019-01-26 08:51:57 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-01-26 08:53:31 -0700 |
| commit | 67f8b42f3e65ede1915f2dc4e2ca46ddeb57c508 (patch) | |
| tree | 0e6742c516779c85949e2b1f85a42fa6f46f954a /sim/common | |
| parent | e5e2bc507d773eb48ed215eb6911c1bb7dd78b79 (diff) | |
| download | gdb-67f8b42f3e65ede1915f2dc4e2ca46ddeb57c508.zip gdb-67f8b42f3e65ede1915f2dc4e2ca46ddeb57c508.tar.gz gdb-67f8b42f3e65ede1915f2dc4e2ca46ddeb57c508.tar.bz2 | |
Fix the sim build
Simon pointed out that the "common/" include change in gdb broke the
sim build. The problem was that the sim was using gdb's
create-version.sh, which changed.
This patch copies create-version.sh to the sim, so that it can
generate "version.c" in a way that works in the sim build.
Tested by rebuilding.
sim/common/ChangeLog
2019-01-26 Tom Tromey <tom@tromey.com>
* Make-common.in (version.c): Use sim's create-version.sh.
* create-version.sh: New file.
sim/ppc/ChangeLog
2019-01-26 Tom Tromey <tom@tromey.com>
* Makefile.in (version.c): Use sim's create-version.sh.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 4 | ||||
| -rwxr-xr-x | sim/common/create-version.sh | 38 |
3 files changed, 45 insertions, 2 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c05b535..d807705 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2019-01-26 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 b211e16..1a3bcc9 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 new file mode 100755 index 0000000..51cffe8 --- /dev/null +++ b/sim/common/create-version.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Copyright (C) 1989-2019 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-GDB-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/version.in > version.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 +mv version.c-tmp $output +rm -f version.tmp |