Index: gdb/configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.40
diff -u -p -r1.40 configure.in
--- configure.in	2000/07/27 04:01:24	1.40
+++ configure.in	2000/08/01 19:10:49
@@ -1014,12 +1014,19 @@ if test "${target}" = "${host}"; then
 nativefile=`sed -n '
 s/NAT_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
 ' ${host_makefile_frag}`
-# else
+else
 # GDBserver is only useful in a "native" enviroment
-# configdirs=`echo $configdirs | sed 's/gdbserver//'`
+configdirs=`echo $configdirs | sed 's/gdbserver//'`
 fi
 changequote([,])
 
+SUBDIRS="doc testsuite nlm $configdirs"
+if test "${enable_multi_ice}" = "yes"; then
+  SUBDIRS="${SUBDIRS} multi-ice"
+fi
+
+AC_SUBST(SUBDIRS)
+
 # New targets should just set gdb_multi_arch=yes in configure.tgt.
 # Old targets being converted can either do that or set GDB_MULTI_ARCH
 # in the target specific makefile frag.  Eventually gdb_multi_arch=yes
@@ -1045,14 +1052,6 @@ case "${GDB_MULTI_ARCH}" in
 	fi ;;
     *)  AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");;
 esac
-
-
-SUBDIRS="doc testsuite nlm"
-if test "${enable_multi_ice}" = "yes"; then
-  SUBDIRS="${SUBDIRS} multi-ice"
-fi
-
-AC_SUBST(SUBDIRS)
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
Index: gdb/config/arm/tm-linux.h
===================================================================
RCS file: /cvs/src/src/gdb/config/arm/tm-linux.h,v
retrieving revision 1.5
diff -u -p -r1.5 tm-linux.h
--- tm-linux.h	2000/05/25 18:24:33	1.5
+++ tm-linux.h	2000/08/01 19:10:52
@@ -135,4 +135,7 @@ extern CORE_ADDR in_svr4_dynsym_resolve_
 #define IN_SOLIB_DYNSYM_RESOLVE_CODE  in_svr4_dynsym_resolve_code */
 #endif
 
+/* Define to support ARM Linux in gdbserver/low-linux.c. */
+#define ARM_GNULINUX_TARGET
+
 #endif /* TM_ARMLINUX_H */
Index: gdb/gdbserver/low-linux.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/low-linux.c,v
retrieving revision 1.3
diff -u -p -r1.3 low-linux.c
--- low-linux.c	2000/06/13 03:17:11	1.3
+++ low-linux.c	2000/08/01 19:10:55
@@ -276,6 +276,24 @@ m68k_linux_register_u_addr (blockend, re
 {
   return (blockend + 4 * regmap[regnum]);
 }
+#elif defined(ARM_GNULINUX_TARGET)
+static void
+initialize_arch (void)
+{
+  return;
+}
+
+int
+arm_linux_register_u_addr (int blockend, int regnum)
+{
+  return blockend + REGISTER_BYTE (regnum);
+}
+
+#if !defined (REGISTER_U_ADDR)
+#define REGISTER_U_ADDR(addr,blockend,regno)  \
+  arm_linux_register_u_addr (blockend, regno)
+#endif
+
 #elif defined(IA64_GNULINUX_TARGET)
 #undef NUM_FREGS
 #define NUM_FREGS 0