Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/Makefile.in,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile.in
--- Makefile.in	12 May 2009 22:25:00 -0000	1.74
+++ Makefile.in	17 Jun 2009 14:45:09 -0000
@@ -181,7 +181,7 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} $
 gdbreplay$(EXEEXT): $(GDBREPLAY_OBS)
 	rm -f gdbreplay$(EXEEXT)
 	${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \
-	  $(XM_CLIBS)
+	  $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 # Put the proper machine-specific files first, so M-. on a machine
 # specific routine gets the one for the correct machine.
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/configure.ac,v
retrieving revision 1.25
diff -u -p -r1.25 configure.ac
--- configure.ac	22 Mar 2009 23:57:10 -0000	1.25
+++ configure.ac	17 Jun 2009 14:45:09 -0000
@@ -182,7 +182,7 @@ if test "$srv_xmlfiles" != ""; then
 fi
 
 GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles"
-GDBSERVER_LIBS="$srv_libs"
+GDBSERVER_LIBS="$srv_libs $extra_srv_libs"
 
 AC_SUBST(GDBSERVER_DEPFILES)
 AC_SUBST(GDBSERVER_LIBS)