gcc: Fix break_hander attribute handling

Issue: CR-1081780

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 72 insertions, 0 deletions

diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-10/0055-Patch-MicroBlaze.patch b/meta-microblaze/recipes-devtools/gcc/gcc-10/0055-Patch-MicroBlaze.patch
new file mode 100644
index 00000000..4d6cbae6
--- /dev/null
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-10/0055-Patch-MicroBlaze.patch
@@ -0,0 +1,71 @@
+From db280c2d72bb043215b2fdfe7cf959fb50d3ce80 Mon Sep 17 00:00:00 2001
+From: Mahesh Bodapati <mbodapat@xilinx.com>
+Date: Wed, 28 Apr 2021 16:49:18 +0530
+Subject: [PATCH 55] [Patch,MicroBlaze] : If we use break_handler attribute then
+ interrupt vector call happened to break_handler instead of interrupt_handler.
+ this fix will resolve the issue CR-1081780 This fix will not change the
+ behavior of compiler unless there is a usage of break_handler attribute.
+
+---
+ gcc/config/microblaze/microblaze.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
+index d72eb7d5898..e47eb1cd0fe 100644
+--- a/gcc/config/microblaze/microblaze.c
++++ b/gcc/config/microblaze/microblaze.c
+@@ -2019,7 +2019,7 @@ microblaze_save_volatiles (tree func)
+ int
+ microblaze_is_interrupt_variant (void)
+ {
+-  return (interrupt_handler || fast_interrupt);
++  return (interrupt_handler || fast_interrupt || break_handler);
+ }
+ int
+ microblaze_is_break_handler (void)
+@@ -2058,7 +2058,7 @@ microblaze_must_save_register (int regno)
+     {
+       if (df_regs_ever_live_p (regno) 
+          || regno == MB_ABI_MSR_SAVE_REG
+-         || ((interrupt_handler || fast_interrupt)
++         || ((interrupt_handler || fast_interrupt || break_handler)
+               && (regno == MB_ABI_ASM_TEMP_REGNUM
+                  || regno == MB_ABI_EXCEPTION_RETURN_ADDR_REGNUM)))
+        return 1;
+@@ -2274,9 +2274,6 @@ compute_frame_size (HOST_WIDE_INT size)
+   fast_interrupt =
+     microblaze_fast_interrupt_function_p (current_function_decl);
+   save_volatiles = microblaze_save_volatiles (current_function_decl);
+-  if (break_handler)
+-    interrupt_handler = break_handler;
+-
+   gp_reg_size = 0;
+   mask = 0;
+   var_size = size;
+@@ -3236,7 +3233,7 @@ microblaze_expand_prologue (void)
+                                 gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+                                               const0_rtx));
+ 
+-         if (interrupt_handler)
++         if (interrupt_handler || break_handler)
+            /* Do not optimize in flow analysis.  */
+            MEM_VOLATILE_P (mem_rtx) = 1;
+ 
+@@ -3347,12 +3344,12 @@ microblaze_expand_epilogue (void)
+          a load-use stall cycle  :)   This is also important to handle alloca. 
+          (See comments for if (frame_pointer_needed) below.  */
+ 
+-      if (!crtl->is_leaf || interrupt_handler)
++      if (!crtl->is_leaf || interrupt_handler || break_handler)
+        {
+          mem_rtx =
+            gen_rtx_MEM (Pmode,
+                         gen_rtx_PLUS (Pmode, stack_pointer_rtx, const0_rtx));
+-         if (interrupt_handler)
++         if (interrupt_handler || break_handler)
+            /* Do not optimize in flow analysis.  */
+            MEM_VOLATILE_P (mem_rtx) = 1;
+          reg_rtx = gen_rtx_REG (Pmode, MB_ABI_SUB_RETURN_ADDR_REGNUM);
+-- 
+2.17.1
+
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-source_10.%.bbappend
index 2fc9bced..16c845cd 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-source_10.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-source_10.%.bbappend
@@ -56,5 +56,6 @@ SRC_URI_append_microblaze = " \
     file://0052-Patch-microblaze-Add-TARGET_OPTION_OPTIMIZATION-and-.patch \
     file://0053-Patch-microblaze-Reducing-Stack-space-for-arguments.patch \
     file://0054-Patch-MicroBlaze-Typo-in-the-previous-commits.bsefi-.patch \
+    file://0055-Patch-MicroBlaze.patch \
     file://microblaze-mulitlib-hack.patch \
 "