aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/ia64/ia64.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac86016..70b6506 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-28 Tristan Gingold <gingold@adacore.com>
+
+ * config/ia64/ia64.c (ia64_promote_function_mode): Fix promotion
+ when for_return is 2.
+
2011-03-28 Jeff Law <law@redhat.com>
* var-tracking.c (canonicalize_values_mark): Delete unused
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index b86c4d8..5f22b17 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -11001,7 +11001,7 @@ ia64_promote_function_mode (const_tree type,
For all other types passed in the general registers, unused bits are
undefined." */
- if (!AGGREGATE_TYPE_P (type)
+ if (for_return != 2
&& GET_MODE_CLASS (mode) == MODE_INT
&& GET_MODE_SIZE (mode) < UNITS_PER_WORD)
{