diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7d160d2c2..f66c6395b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2005-04-27  Mark Kettenis  <kettenis@gnu.org>
 
+	* solib-svr4.c (_initialize_svr4_solib)
+	[SVR4_FETCH_LINK_MAP_OFFSETS]: Don't set non-existent variable
+	svr4_legacy_fetch_link_map_offsets.
+
 	* sh-tdep.c (sh_linux_svr4_fetch_link_map_offsets): Remove function.
 	(sh_gdbarch_init): Remove redundant prototype.
 	* sh-linux-tdep.c: New file.
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 253be0a846..a1e21b8494 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1412,11 +1412,6 @@ _initialize_svr4_solib (void)
 {
   solib_svr4_data = gdbarch_data_register_pre_init (solib_svr4_init);
 
-  /* FIXME: Eliminate this ASAP.  */
-#ifdef SVR4_FETCH_LINK_MAP_OFFSETS
-  svr4_legacy_fetch_link_map_offsets = SVR4_FETCH_LINK_MAP_OFFSETS;
-#endif
-
   svr4_so_ops.relocate_section_addresses = svr4_relocate_section_addresses;
   svr4_so_ops.free_so = svr4_free_so;
   svr4_so_ops.clear_solib = svr4_clear_solib;