2002-06-17 Elena Zannoni <ezannoni@redhat.com>

	* psim.c (psim_options): Don't choke when gdb invokes us with
	the --architecture option, just ignore it.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 3138c94..6ced05b 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-17  Elena Zannoni  <ezannoni@redhat.com>
+
+       * psim.c (psim_options): Don't choke when gdb invokes us with
+       the --architecture option, just ignore it.
+
 2002-06-16  Andrew Cagney  <ac131313@redhat.com>
 
        * configure: Regenerated to track ../common/aclocal.m4 changes.

diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c
index 20d843b..76bb452 100644 (file)
--- a/sim/ppc/psim.c
+++ b/sim/ppc/psim.c
@@ -341,6 +341,19 @@ psim_options(device *root,
        else
          tree_parse(root, "/openprom/trace/%s 1", param);
        break;
+      case '-':
+       /* it's a long option of the form --optionname=optionvalue.
+          Such options can be passed through if we are invoked by
+          gdb.  */
+       if (strstr(argv[argp], "architecture") != NULL) {
+          /* we must consume the argument here, so that we get out
+             of the loop.  */
+         p = argv[argp] + strlen(argv[argp]) - 1;
+         printf_filtered("Warning - architecture parameter ignored\n");
+        }
+       else
+         error("Unrecognized option");
+       break;
       }
       p += 1;
     }