From bd88542004361085d0345b795e112dc9022cce24 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 4 Jul 2013 01:22:38 +0000 Subject: gdb/ 2013-07-04 Yao Qi Revert: 2013-06-27 Yao Qi * common/create-version.sh: Update comments. Handle the case that TARGET_ALIAS is empty. gdb/gdbserver/ 2013-07-04 Yao Qi * Makefile.in (host_alias): Use @host_noncanonical@. (target_alias): Use @target_noncanonical@. * configure.ac: Use ACX_NONCANONICAL_TARGET and ACX_NONCANONICAL_HOST. * configure: Regenerated. Revert: 2013-06-28 Mircea Gherzan * configure.ac (version_host, version_target): Set and AC_SUBST them. * configure: Rebuild. * Makefile.in (version_host, version_target): Get from configure. (version.c): Use $(version_host) and $(version_target). --- gdb/common/create-version.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'gdb/common') diff --git a/gdb/common/create-version.sh b/gdb/common/create-version.sh index 0bdd0fd..ad50946 100755 --- a/gdb/common/create-version.sh +++ b/gdb/common/create-version.sh @@ -20,17 +20,12 @@ # Create version.c from version.in. # Usage: # create-version.sh PATH-TO-GDB-SRCDIR HOST_ALIAS \ -# [TARGET_ALIAS] OUTPUT-FILE-NAME +# TARGET_ALIAS OUTPUT-FILE-NAME srcdir="$1" host_alias="$2" - -if [ "$#" = "4" ]; then - target_alias="$3" - output="$4" -else - output="$3" -fi +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` @@ -38,10 +33,6 @@ 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 - -if [ "$#" = "4" ]; then - echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp -fi - +echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp mv version.c-tmp $output rm -f version.tmp -- cgit v1.1