diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ca6a0a7299..be3eac2d01 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt (i[34567]86-*-linux*): Use 64-bit configuration if
+	--enable-64-bit-bfd.
+	(sparc-*-linux*): Likewise.
+
 2009-04-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* go32-nat.c (go32_sysinfo): Update list of Windows versions of
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 61dbf6a1ad..e766d68f16 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -191,6 +191,10 @@ i[34567]86-*-linux*)
 	# Target: Intel 386 running GNU/Linux
 	gdb_target_obs="i386-tdep.o i386-linux-tdep.o glibc-tdep.o i387-tdep.o \
 			solib.o solib-svr4.o symfile-mem.o corelow.o linux-tdep.o"
+	if test "x$enable_64_bit_bfd" = "xyes"; then
+	    # Target: GNU/Linux x86-64
+	    gdb_target_obs="amd64-tdep.o amd64-linux-tdep.o ${gdb_target_obs}"
+	fi
 	build_gdbserver=yes
 	;;
 i[34567]86-*-gnu*)
@@ -410,6 +414,11 @@ sparc-*-linux*)
 	# Target: GNU/Linux SPARC
 	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o \
 			sparc-linux-tdep.o solib.o solib-svr4.o symfile-mem.o"
+	if test "x$enable_64_bit_bfd" = "xyes"; then
+	    # Target: GNU/Linux UltraSPARC
+	    gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o \
+			    sparc64-linux-tdep.o ${gdb_target_obs}"
+	fi
 	;;
 sparc64-*-linux*)
 	# Target: GNU/Linux UltraSPARC