Applied patch from Tony.Thompson@arm.com

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab10c92841253c298dda5ac99868d2811943c1e3..9529f17521a049be914e6f7a2b8810c70e9eea22 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 12:29:13 1998  Nick Clifton  <nickc@cygnus.com>
+
+       * remote-rdi.c (arm_rdi_open): Patch from Tony.Thompson@arm.com
+       to prevent spurous error messages on non-ICE targets.
+
 start-sanitize-vr4111
 Thu Jan 15 09:28:52 1998  Gavin Koch  <gavin@cygnus.com>
 

diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 19cedd312c5668ed528deeab0ccb8378a6ad8b88..6db42c15629c5499ae7c61d0b8c346a70c30dfec 100644 (file)
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -252,16 +252,29 @@ device is attached to the remote system (e.g. /dev/ttya).");
     {
       printf_filtered ("RDI_info: %s\n", rdi_error_message (rslt));
     }
-  rslt = angel_RDI_info (RDIInfo_Icebreaker, &arg1, &arg2);
+
+  /*
+  ** There's no point asking if the target's an ICEBreaker, unless
+  ** you're going to do something with the answer. All it does is provoke
+  ** an error message on non-ICE targets
+  rslt = angel_RDI_info (RDIInfo_Icebreaker, & arg1, & arg2);
   if (rslt)
     {
       printf_filtered ("RDI_info: %s\n", rdi_error_message (rslt));
     }
-  rslt = angel_RDI_info (RDIInfo_DownLoad, &arg1, &arg2);
+    */
+
+  /*
+  ** There's no point asking if the target can accept a configuration download,
+  ** unless you're going to do something with the answer. All it does is
+  ** provoke an error message on non-ICE targets
+  rslt = angel_RDI_info (RDIInfo_DownLoad, & arg1, & arg2);
   if (rslt)
     {
       printf_filtered ("RDI_info: %s\n", rdi_error_message (rslt));
     }
+    */
+
   rslt = angel_RDI_info (RDIInfo_GetLoadSize, &arg1, &arg2);
   if (rslt)
     {