gdb/

	* symfile.c (download_write_size): Remove.
	(show_download_write_size): Remove.
	(load_section_callback): Don't use download_write_size.
	(_initialize_symfile): Don't register download_write_size.
	* NEWS: Mention 'download-write-size' removal.
gdb/doc/
	* gdb.texinfo (Target Commands): Remove
	'set download-write-size' and 'show download-write-size'.
gdb/testsuite/
	* config/monitor.exp (gdb_load): Remove support for obsolete
	download-write-size.
	* gdb.base/remote.exp: Likewise.  Update all callers of
	gdb_timed_load.

8 files changed, 33 insertions, 82 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fb6e84a..4669e8a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-08  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* symfile.c (download_write_size): Remove.
+	(show_download_write_size): Remove.
+	(load_section_callback): Don't use download_write_size.
+	(_initialize_symfile): Don't register download_write_size.
+	* NEWS: Mention 'download-write-size' removal.
+
 2006-08-06  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* expprint.c (print_subexp_standard, dump_subexp_body_standard): Add
diff --git a/gdb/NEWS b/gdb/NEWS
index 9d54b25..d288c9d 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -18,6 +18,8 @@ The ARM Demon monitor support (RDP protocol, "target rdp").
 Kernel Object Display, an embedded debugging feature which only worked with
 an obsolete version of Cisco IOS.
 
+The 'set download-write-size' and 'show download-write-size' commands.
+
 * New remote packets
 
 qSupported:
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index b1e539b..40f443d 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-08  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* gdb.texinfo (Target Commands): Remove 
+	'set download-write-size' and 'show download-write-size'.
+
 2006-08-01  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* stabs.texinfo (Member Type Descriptor): Correct example for
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 1bac2b8..07a3004 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -12133,22 +12133,9 @@ your configuration may have more or fewer targets.
 
 Many remote targets require you to download the executable's code once
 you've successfully established a connection.  You may wish to control
-various aspects of this process, such as the size of the data chunks
-used by @value{GDBN} to download program parts to the remote target.
-
-@table @code
-@kindex set download-write-size
-@item set download-write-size @var{size}
-Set the write size used when downloading a program.  Only used when
-downloading a program onto a remote target.  Specify zero or a
-negative value to disable blocked writes.  The actual size of each
-transfer is also limited by the size of the target packet and the
-memory cache.
-
-@kindex show download-write-size
-@item show download-write-size
-@kindex show download-write-size
-Show the current value of the write size.
+various aspects of this process.
+
+@table @code
 
 @item set hash
 @kindex set hash@r{, for remote monitors}
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 7dbbb7b..396be8f 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1521,15 +1521,6 @@ load_command (char *arg, int from_tty)
    we don't want to run a subprocess.  On the other hand, I'm not sure how
    performance compares.  */
 
-static int download_write_size = 512;
-static void
-show_download_write_size (struct ui_file *file, int from_tty,
-			  struct cmd_list_element *c, const char *value)
-{
-  fprintf_filtered (file, _("\
-The write size used when downloading a program is %s.\n"),
-		    value);
-}
 static int validate_download = 0;
 
 /* Callback service function for generic_load (bfd_map_over_sections).  */
@@ -1570,11 +1561,6 @@ load_section_callback (bfd *abfd, asection *asec, void *data)
 	  const char *sect_name = bfd_get_section_name (abfd, asec);
 	  bfd_size_type sent;
 
-	  if (download_write_size > 0 && size > download_write_size)
-	    block_size = download_write_size;
-	  else
-	    block_size = size;
-
 	  buffer = xmalloc (size);
 	  old_chain = make_cleanup (xfree, buffer);
 
@@ -1591,8 +1577,6 @@ load_section_callback (bfd *abfd, asection *asec, void *data)
 	      int len;
 	      bfd_size_type this_transfer = size - sent;
 
-	      if (this_transfer >= block_size)
-		this_transfer = block_size;
 	      len = target_write_memory_partial (lma, buffer,
 						 this_transfer, &err);
 	      if (err)
@@ -3806,19 +3790,6 @@ Usage: set extension-language .foo bar"),
   add_info ("extensions", info_ext_lang_command,
 	    _("All filename extensions associated with a source language."));
 
-  add_setshow_integer_cmd ("download-write-size", class_obscure,
-			   &download_write_size, _("\
-Set the write size used when downloading a program."), _("\
-Show the write size used when downloading a program."), _("\
-Only used when downloading a program onto a remote\n\
-target. Specify zero, or a negative value, to disable\n\
-blocked writes. The actual size of each transfer is also\n\
-limited by the size of the target packet and the memory\n\
-cache."),
-			   NULL,
-			   show_download_write_size,
-			   &setlist, &showlist);
-
   debug_file_directory = xstrdup (DEBUGDIR);
   add_setshow_optional_filename_cmd ("debug-file-directory", class_support,
 				     &debug_file_directory, _("\
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5782ce6..6785090 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config/monitor.exp (gdb_load): Remove support for obsolete
+	download-write-size.
+	* gdb.base/remote.exp: Likewise.  Update all callers of
+	gdb_timed_load.
+
 2006-08-02  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* cursal.exp: Pass binfile to gdb_load.
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index c0fb464..e71b99b 100644
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -140,17 +140,6 @@ proc gdb_load { arg } {
     global timeout
     global last_gdb_file;
 
-    if [target_info exists gdb_download_size] {
-	send_gdb "set download-write-size [target_info gdb_download_size]\n";
-	gdb_expect 30 {
-	    -re "$gdb_prompt $" { }
-	    default {
-		perror "Setting download-write-size for target failed";
-		return -1;
-	    }
-	}
-    }
-
     if { $arg == "" } {
 	if [info exists last_gdb_file] {
 	    set arg $last_gdb_file;
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index cf9e853..1c37017 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -46,17 +46,6 @@ if {$result != "" } then {
 # Part ONE: Check the down load commands
 #
 
-gdb_test "show download-write-size" \
-	"The write size used when downloading a program is 512." \
-	"download limit default"
-
-gdb_test "set download-write-size" "Argument required.*"
-
-gdb_test "set download-write-size 0" ""
-gdb_test "show download-write-size" \
-	"The write size used when downloading a program is unlimited." \
-	"set download limit - unlimited"
-
 gdb_test "show remote memory-write-packet-size" \
 	"The memory-write-packet-size is 0. Packets are limited to \[0-9\]+ bytes." \
 	"write-packet default"
@@ -79,21 +68,14 @@ gdb_test "show remote memory-write-packet-size" \
 # Part TWO: Check the download behavour
 #
 
-proc gdb_load_timed {executable downloadsize class writesize} {
+proc gdb_load_timed {executable class writesize} {
     global test gdb_prompt
-    set test "timed download `[file tail $executable]' - $downloadsize, $class, $writesize"
+    set test "timed download `[file tail $executable]' - $class, $writesize"
 
     if {$writesize != ""} then {
 	gdb_test "set remote memory-write-packet-size $writesize" \
 		"" "$test - set packet size"
-    }
-
-    if {$downloadsize != ""} then {
-	gdb_test "set download-write-size $downloadsize" \
-		"" "$test - set download size"
-    }
 
-    if {$downloadsize != ""} then {
 	send_gdb "set remote memory-write-packet-size $class\n"
 	gdb_expect 5 {
 	    -re ".*Change the packet size.*$" {
@@ -127,18 +109,18 @@ proc gdb_load_timed {executable downloadsize class writesize} {
     pass $test
 }
 
-gdb_load_timed $binfile {} "" {}
+gdb_load_timed $binfile "" {}
 
 # Typically about 400-1 bytes can be downloaded
-gdb_load_timed $binfile 0 "limit" 398
-gdb_load_timed $binfile 0 "limit" 400
+gdb_load_timed $binfile "limit" 398
+gdb_load_timed $binfile "limit" 400
 
 # Absolute max is 16384
-gdb_load_timed $binfile 0 "fixed" 0
-gdb_load_timed $binfile 0 "fixed" 16385
+gdb_load_timed $binfile "fixed" 0
+gdb_load_timed $binfile "fixed" 16385
 
 # fall back to the default
-gdb_load_timed $binfile 0 "limit" 0
+gdb_load_timed $binfile "limit" 0
 
 # Get size of data uploaded