gdb/

2013-07-04  Yao Qi  <yao@codesourcery.com>

	Revert:
	2013-06-27  Yao Qi  <yao@codesourcery.com>

	* common/create-version.sh: Update comments.  Handle the case
	that TARGET_ALIAS is empty.

gdb/gdbserver/

2013-07-04  Yao Qi  <yao@codesourcery.com>

	* 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  <mircea.gherzan@intel.com>

	* 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).

6 files changed, 56 insertions, 36 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc695b7..c7b8c1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-04  Yao Qi  <yao@codesourcery.com>
+
+	Revert:
+	2013-06-27  Yao Qi  <yao@codesourcery.com>
+
+	* common/create-version.sh: Update comments.  Handle the case
+	that TARGET_ALIAS is empty.
+
 2013-07-03  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (config.status): Depend on development.sh.
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
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 39fa741..3d963ea 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,19 @@
+2013-07-04  Yao Qi  <yao@codesourcery.com>
+
+	* 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  <mircea.gherzan@intel.com>
+
+	* 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).
+
 2013-07-03  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (config.status): Depend on development.sh.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 3286fe1..2cbf208 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -18,10 +18,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-host_alias = @host_alias@
-target_alias = @target_alias@
-version_host = @version_host@
-version_target = @version_target@
+host_alias = @host_noncanonical@
+target_alias = @target_noncanonical@
 program_transform_name = @program_transform_name@
 bindir = @bindir@
 libdir = @libdir@
@@ -393,7 +391,7 @@ force:
 
 version.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
 	$(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
-	    $(version_host) $(version_target) version.c
+	    $(host_alias) $(target_alias) version.c
 
 xml-builtin.c: stamp-xml; @true
 stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 2ba961d..193aedc 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -589,8 +589,6 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
-version_target
-version_host
 GNULIB_STDINT_H
 extra_libraries
 IPA_DEPFILES
@@ -614,6 +612,8 @@ MAKE
 CCDEPMODE
 DEPDIR
 am__leading_dot
+host_noncanonical
+target_noncanonical
 ALLOCA
 RANLIB
 INSTALL_DATA
@@ -4550,6 +4550,26 @@ fi
   fi
 
 
+ case ${build_alias} in
+  "") build_noncanonical=${build} ;;
+  *) build_noncanonical=${build_alias} ;;
+esac
+
+ case ${host_alias} in
+  "") host_noncanonical=${build_noncanonical} ;;
+  *) host_noncanonical=${host_alias} ;;
+esac
+
+ case ${target_alias} in
+  "") target_noncanonical=${host_noncanonical} ;;
+  *) target_noncanonical=${target_alias} ;;
+esac
+
+
+
+
+
+
 # Dependency checking.
 rm -rf .tst 2>/dev/null
 mkdir .tst 2>/dev/null
@@ -5998,14 +6018,6 @@ if test x"$STDINT_H" != x; then
 fi
 
 
-# For --version, we want to the print --host/--target exactly
-# as passed to configure.  But if those were not specified, then
-# print the canonical host/target.
-version_host=${host_alias:-$host}
-version_target=${target_alias:-$target}
-
-
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_commands="$ac_config_commands default"
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 4ce7918..456a1f7 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -53,6 +53,9 @@ else
 fi
 GDB_AC_LIBMCHECK(${libmcheck_default})
 
+ACX_NONCANONICAL_TARGET
+ACX_NONCANONICAL_HOST
+
 # Dependency checking.
 ZW_CREATE_DEPDIR
 ZW_PROG_COMPILER_DEPENDENCIES([CC])
@@ -483,14 +486,6 @@ if test x"$STDINT_H" != x; then
 fi
 AC_SUBST(GNULIB_STDINT_H)
 
-# For --version, we want to the print --host/--target exactly
-# as passed to configure.  But if those were not specified, then
-# print the canonical host/target.
-version_host=${host_alias:-$host}
-version_target=${target_alias:-$target}
-AC_SUBST(version_host)
-AC_SUBST(version_target)
-
 AC_OUTPUT(Makefile,
 [case x$CONFIG_HEADERS in
 xconfig.h:config.in)