aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheldon Lobo <smlobo@sheldon.us.oracle.com>2017-05-26 19:12:24 +0000
committerSheldon Lobo <smlobo@sheldon.us.oracle.com>2017-05-26 19:12:24 +0000
commit4e80859cff578dfdc672d882ff6046ed2a821824 (patch)
tree6283a23ddc1cd6a1c7256e4d0e80667af2b27a64
parent59d8a602c3242c90e3bddd2f1738ec5d809a8444 (diff)
Backported from mainline
2017-05-24 Sheldon Lobo <smlobo@sheldon.us.oracle.com> * config/sparc/sparc.md (length): Return the correct value for -mflat sibcalls to match output_sibcall. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@248524 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/sparc/sparc.md3
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b648223d77..6ad30154f8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-26 Sheldon Lobo <smlobo@sheldon.us.oracle.com>
+
+ Backported from mainline
+ 2017-05-24 Sheldon Lobo <smlobo@sheldon.us.oracle.com>
+
+ * config/sparc/sparc.md (length): Return the correct value for -mflat
+ sibcalls to match output_sibcall.
+
2017-05-26 Martin Liska <mliska@suse.cz>
Backport from mainline
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index 7c8ea8c7d5f..3cd5b4b0187 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -331,7 +331,8 @@
(const_int 2)
(const_int 1))
(eq_attr "type" "sibcall")
- (if_then_else (eq_attr "leaf_function" "true")
+ (if_then_else (ior (eq_attr "leaf_function" "true")
+ (eq_attr "flat" "true"))
(if_then_else (eq_attr "empty_delay_slot" "true")
(const_int 3)
(const_int 2))