2004-06-13 Andrew Cagney <cagney@gnu.org>

	* infcmd.c (print_return_value): Fix logic, allow
	DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS when struct_return.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2c8740b3890b5cecd88c2919060be0524e45a86..88d2c463b0f84a97b59d50aaa38a61766a5e4103 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-13  Andrew Cagney  <cagney@gnu.org>
 
+       * infcmd.c (print_return_value): Fix logic, allow
+       DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS when struct_return.
+
        * gdbarch.sh: For predicates, do not check GDB_MULTI_ARCH when
        defining any macros.
        * gdbarch.h: Re-generate.

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 4eeacca8838188b69815904e86192b4a9b8fd8f1..3aa6e41c4abe0c031b2e06257593f40a6e166be6 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1109,7 +1109,7 @@ print_return_value (int struct_return, struct type *value_type)
          internal_error (__FILE__, __LINE__, "bad switch");
        }
     }
-  else if (!struct_return && DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P ())
+  else if (struct_return && DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P ())
     {
       CORE_ADDR addr = DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (stop_registers);
       if (!addr)