breakage with "switch to gdb version script"

breakage with "switch to gdb version script"

[Hans-Peter Nilsson]

This commit:

commit 8c32ba22334b8be1c2cf412a789deeded786e1f5
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Apr 10 19:40:54 2015 -0400

    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.

 sim/common/ChangeLog         |    5 +++++
 sim/common/Make-common.in    |    5 +++--
 sim/common/create-version.sh |   38 --------------------------------------
 3 files changed, 8 insertions(+), 40 deletions(-)

seems to have caused breakage building a sim for
powerpc-unknown-eabisim:

...
make[3]: *** No rule to make target `/tmp/hpautotest-sim/src/sim/ppc/../common/create-version.sh', needed by `version.c'.  Stop.
make[3]: Leaving directory `/tmp/hpautotest-sim/powerpc-eabisim/sim/ppc'
make[2]: *** [all] Error 1make[2]: Leaving directory `/tmp/hpautotest-sim/powerpc-eabisim/sim'

While that seems pretty trivial, you also need to adjust
src-release.sh to make sure "./src-release.sh -b sim" works,
in which a tool-specific create-version.sh is searched.

brgds, H-P

[PATCH] sim: ppc: fix up version script

[Mike Frysinger]

The common sim code has switched to using gdb directly; update the
ppc copy too.

Committed.
---
 sim/ppc/ChangeLog   | 5 +++++
 sim/ppc/Makefile.in | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 51963846..cd185ba 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/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-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 964a7b3..5278f3b 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -565,8 +565,9 @@ $(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 $(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
 version.o: version.c $(version_h)
 
 psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
-- 
2.3.5

Re: breakage with "switch to gdb version script"

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

On 13 Apr 2015 16:35, Hans-Peter Nilsson wrote:
> While that seems pretty trivial, you also need to adjust
> src-release.sh to make sure "./src-release.sh -b sim" works,
> in which a tool-specific create-version.sh is searched.

this probably does it, but i've never used src-release before ...
-mike

--- a/src-release.sh
+++ b/src-release.sh
@@ -244,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -301,7 +302,7 @@ sim_release()
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: breakage with "switch to gdb version script"

[Hans-Peter Nilsson]

> From: Mike Frysinger <vapier@gentoo.org>
> Date: Tue, 14 Apr 2015 17:29:20 +0200

> On 13 Apr 2015 16:35, Hans-Peter Nilsson wrote:
> > While that seems pretty trivial, you also need to adjust
> > src-release.sh to make sure "./src-release.sh -b sim" works,
> > in which a tool-specific create-version.sh is searched.
> 
> this probably does it, but i've never used src-release before ...

You use it to create a release-like tarball (example
command-line above), check that you can build and install $tool
(in this case sim) for any target from it; presto, testing
complete.

brgds, H-P

Re: breakage with "switch to gdb version script"

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

On 14 Apr 2015 22:43, Hans-Peter Nilsson wrote:
> From: Mike Frysinger <vapier@gentoo.org>
> > On 13 Apr 2015 16:35, Hans-Peter Nilsson wrote:
> > > While that seems pretty trivial, you also need to adjust
> > > src-release.sh to make sure "./src-release.sh -b sim" works,
> > > in which a tool-specific create-version.sh is searched.
> > 
> > this probably does it, but i've never used src-release before ...
> 
> You use it to create a release-like tarball (example
> command-line above), check that you can build and install $tool
> (in this case sim) for any target from it; presto, testing
> complete.

i tried that but it failed with weird gdb info error messags (which looked 
unrelated to match patch) so i gave up
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: breakage with "switch to gdb version script"

[Hans-Peter Nilsson]

> From: Mike Frysinger <vapier@gentoo.org>
> Date: Tue, 14 Apr 2015 23:18:04 +0200

> On 14 Apr 2015 22:43, Hans-Peter Nilsson wrote:
> > From: Mike Frysinger <vapier@gentoo.org>
> > > On 13 Apr 2015 16:35, Hans-Peter Nilsson wrote:
> > > > While that seems pretty trivial, you also need to adjust
> > > > src-release.sh to make sure "./src-release.sh -b sim" works,
> > > > in which a tool-specific create-version.sh is searched.
> > > 
> > > this probably does it, but i've never used src-release before ...
> > 
> > You use it to create a release-like tarball (example
> > command-line above), check that you can build and install $tool
> > (in this case sim) for any target from it; presto, testing
> > complete.
> 
> i tried that but it failed with weird gdb info error messags (which looked 
> unrelated to match patch) so i gave up

I saw no such problem at 69cb14a0d7, neither for sim nor gdb,
using an x86_64 Debian 7.1.  Info-files *are* being generated
with src-release.sh, as for a release, so your development tools
have to be complete.  You probably expected this kind of
reponse, but still: unless it was a temporary bug fixed between
your test and the commit above, I'd guess your makeinfo tools
are out of date or something similar, which would not be
something you can allow yourself to "give up" on, and just skip
testing.  Pretty please investigate.

Regarding using the gdb create-version.sh for sim, I'd rather we
increase separation between sim and gdb sources than making them
more intertwined like that.

Anyway, I committed the following after testing, building sim
and gdb ("make all"), for each untarring the created tarballs
and respectively building a native gdb and a bfin-elf sim.  The
need for gdb/common/create-version.sh should be obvious, but
JFTR, you'll otherwise get:
/bin/bash /tmp/fix/s/s2/sim-7.9.50.20150415/sim/bfin/../../move-if-change tmp-tmap.c targ-map.c
touch stamp-tvals
make[3]: *** No rule to make target `/tmp/fix/s/s2/sim-7.9.50.20150415/sim/bfin/../../gdb/common/create-version.sh', needed by `version.c'.  Stop.
make[3]: Leaving directory `/tmp/fix/s/s2/o/sim/bfin'

toplevel:
	Adjust src-release.sh for sim using the gdb create-version.sh.
	* src-release.sh (tar_compress): If there's a fifth parameter,
	use that in the getver call instead of $tool.
	(sim_release): Pass gdb as fifth parameter to tar_compress.
	(SIM_SUPPORT_DIRS): Add gdb/common/create-version.sh.

diff --git a/src-release.sh b/src-release.sh
index 9b985f0..40d0126 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -244,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -295,13 +296,13 @@ gdb_release()
 }
 
 # Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms zlib"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in gdb/common/create-version.sh makefile.vms zlib"
 sim_release()
 {
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()

brgds, H-P

Re: breakage with "switch to gdb version script"

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1482 bytes --]

On 15 Apr 2015 04:16, Hans-Peter Nilsson wrote:
> I saw no such problem at 69cb14a0d7, neither for sim nor gdb,
> using an x86_64 Debian 7.1.  Info-files *are* being generated
> with src-release.sh, as for a release, so your development tools
> have to be complete.  You probably expected this kind of
> reponse, but still: unless it was a temporary bug fixed between
> your test and the commit above, I'd guess your makeinfo tools
> are out of date or something similar, which would not be
> something you can allow yourself to "give up" on, and just skip
> testing.  Pretty please investigate.

i run Gentoo and then some.  tooling versions are almost never an issue (unless 
they're too new).  in this case i had a GNUmakefile in a subdir lying around 
that confused things.  not that the error maked sense:
...
make[1]: Entering directory '/usr/local/src/gnu/gdb/libiberty/testsuite'
make[1]: Nothing to be done for 'info'.
make[1]: Leaving directory '/usr/local/src/gnu/gdb/libiberty/testsuite'
make: Nothing to be done for 'info'.
make: *** No rule to make target 'info'.  Stop.
$

> Regarding using the gdb create-version.sh for sim, I'd rather we
> increase separation between sim and gdb sources than making them
> more intertwined like that.

the source repos aren't going to split, so i don't think we should spend time on 
the git side.  there's no reason though we couldn't bundle version.c in the sim/ 
tree and drop gdb/ entirely.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]