* create-version.sh: Align parameters to match those of

	../../gdb/common/create-version.sh.
	* Make-common.in (srcsim): New variable.
	(version.c): Adjust call to create-version.sh as per above.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 9515b1db54dfa8f2c3feba1e247a53f6c4b13673..2a5b9d89b86e0fd44dfd11a0d948022d7fb309b0 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-15  Hans-Peter Nilsson  <hp@axis.com>
+
+       * create-version.sh: Align parameters to match those of
+       ../../gdb/common/create-version.sh.
+       * Make-common.in (srcsim): New variable.
+       (version.c): Adjust call to create-version.sh as per above.
+
 2013-09-23  Alan Modra  <amodra@gmail.com>
 
        * configure: Regenerate.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index afa3894aa380a63ae6a8de04fdc56daad735dec1..429fa0cceaffa464b2a93fff37d084cd93601d42 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -38,6 +38,7 @@ VPATH = @srcdir@:$(srccom)
 srcdir = @srcdir@
 srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
+srcsim = $(srcdir)/..
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -301,7 +302,7 @@ stamp-tvals: gentmap
        touch stamp-tvals
 
 version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/version.in
-       $(SHELL) $(srccom)/create-version.sh $(srccom) version.c
+       $(SHELL) $(srccom)/create-version.sh $(srcsim) $(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
index 746427738a2dd7b129374b712c412e134622a64c..ea981967d6880a0ed5d0cc688a9301a818cbf681 100755 (executable)
--- a/sim/common/create-version.sh
+++ b/sim/common/create-version.sh
@@ -17,16 +17,21 @@
 # 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.
+# 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-COMMON-SIM-SRCDIR OUTPUT-FILE-NAME
+#    create-version.sh PATH-TO-SIM-SRCDIR HOST_ALIAS \
+#        TARGET_ALIAS OUTPUT-FILE-NAME
 
 srcdir="$1"
-output="$2"
+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
+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