diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f44f45..b6b9124 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-02-18 H.J. Lu <hongjiu.lu@intel.com> + + PR target/39224 + * config/i386/i386.c (ix86_return_in_memory): Properly check + ABI. + 2009-02-18 Jason Merrill <jason@redhat.com> PR target/39179 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index da36f17..e41f501 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6211,10 +6211,13 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED) #else const enum machine_mode mode = type_natural_mode (type, NULL); - if (TARGET_64BIT_MS_ABI) - return return_in_memory_ms_64 (type, mode); - else if (TARGET_64BIT) - return return_in_memory_64 (type, mode); + if (TARGET_64BIT) + { + if (ix86_function_type_abi (fntype) == MS_ABI) + return return_in_memory_ms_64 (type, mode); + else + return return_in_memory_64 (type, mode); + } else return return_in_memory_32 (type, mode); #endif |