Re: [PATCH v3] gdbserver: fix the standalone build

[Yao Qi <yao@codesourcery.com>]

On 07/03/2013 11:04 PM, Yao Qi wrote:
> The following patches are to use @target_noncanonical@ and
> @host_noncanonical@ in GDBserver.  In order to make review easier, I
> split the patch into two, #1 is to revert two previous commits, and #2
> is to use noncanonical stuff.  These two patches should be committed to
> cvs in one go.

Here is the patch 2/2.

Since config/acx.m4 was included in gdb/gdbserver/acinclude.m4, we don't
have to include it.

-- 
Yao (齐尧)


gdb/gdbserver:

2013-07-03  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.
---
 gdb/gdbserver/Makefile.in  |    4 ++--
 gdb/gdbserver/configure    |   22 ++++++++++++++++++++++
 gdb/gdbserver/configure.ac |    3 +++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index d6c3ea8..8f297c6 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -18,8 +18,8 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-host_alias = @host_alias@
-target_alias = @target_alias@
+host_alias = @host_noncanonical@
+target_alias = @target_noncanonical@
 program_transform_name = @program_transform_name@
 bindir = @bindir@
 libdir = @libdir@
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 173797a..d4d12ae 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -612,6 +612,8 @@ MAKE
 CCDEPMODE
 DEPDIR
 am__leading_dot
+host_noncanonical
+target_noncanonical
 ALLOCA
 RANLIB
 INSTALL_DATA
@@ -4478,6 +4480,26 @@ _ACEOF
 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
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 95bb0c6..3c8569f 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -41,6 +41,9 @@ AC_HEADER_DIRENT
 
 AC_FUNC_ALLOCA
 
+ACX_NONCANONICAL_TARGET
+ACX_NONCANONICAL_HOST
+
 # Dependency checking.
 ZW_CREATE_DEPDIR
 ZW_PROG_COMPILER_DEPENDENCIES([CC])
-- 
1.7.7.6