[gcc(refs/users/giulianob/heads/pfe_backport)] Backport Fix PR 93242: patchable-function-entry broken on MIPS

[gcc(refs/users/giulianob/heads/pfe_backport)] Backport Fix PR 93242: patchable-function-entry broken on MIPS

[Giuliano Belinassi]

https://gcc.gnu.org/g:2435fb01446d4516896cb70946980138efa38d1d

commit 2435fb01446d4516896cb70946980138efa38d1d
Author: Andrew Pinski <apinski@marvell.com>
Date:   Sat Jan 18 00:41:06 2020 +0000

    Backport Fix PR 93242: patchable-function-entry broken on MIPS
    
    On MIPS, .set noreorder/reorder needs to emitted around
    the nop.  The template for the nop instruction uses %(/%) to
    do that.  But default_print_patchable_function_entry uses
    fprintf rather than output_asm_insn to output the instruction.
    
    This fixes the problem by using output_asm_insn to emit the nop
    instruction.
    
    ChangeLog:
    
    PR middle-end/93242
    * targhooks.c (default_print_patchable_function_entry): Use
    output_asm_insn to emit the nop instruction.

Diff:
---
 gcc/ChangeLog   | 10 ++++++++++
 gcc/targhooks.c |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fefc11a89fc..65fed165f1a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,16 @@
 2021-10-07  Giuliano Belinassi  <gbelinassi@suse.de>
+
 	Backport from mainline
+	2020-01-20  Andrew Pinski  <apinski@marvell.com>
+
+	PR middle-end/93242
+	* targhooks.c (default_print_patchable_function_entry): Use
+	output_asm_insn to emit the nop instruction.
+
 
+2021-10-07  Giuliano Belinassi  <gbelinassi@suse.de>
+
+	Backport from mainline
 	2020-01-20  Fangrui Song  <maskray@google.com>
 
 	PR middle-end/93194
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index aaf536acf17..185dc7b0b6b 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1655,7 +1655,7 @@ default_print_patchable_function_entry (FILE *file,
 
   unsigned i;
   for (i = 0; i < patch_area_size; ++i)
-    fprintf (file, "\t%s\n", nop_templ);
+    output_asm_insn (nop_templ, NULL);
 }
 
 bool

[gcc(refs/users/giulianob/heads/pfe_backport)] Backport Fix PR 93242: patchable-function-entry broken on MIPS

[Giuliano Belinassi]

https://gcc.gnu.org/g:770fcd0a31f3d557e5c79004161fa4c14fdaeced

commit 770fcd0a31f3d557e5c79004161fa4c14fdaeced
Author: Andrew Pinski <apinski@marvell.com>
Date:   Sat Jan 18 00:41:06 2020 +0000

    Backport Fix PR 93242: patchable-function-entry broken on MIPS
    
    On MIPS, .set noreorder/reorder needs to emitted around
    the nop.  The template for the nop instruction uses %(/%) to
    do that.  But default_print_patchable_function_entry uses
    fprintf rather than output_asm_insn to output the instruction.
    
    This fixes the problem by using output_asm_insn to emit the nop
    instruction.
    
    gcc/ChangeLog
    2021-10-07  Giuliano Belinassi  <gbelinassi@suse.de>
    
            Backport from mainline
            2020-01-20  Andrew Pinski  <apinski@marvell.com>
    
            PR middle-end/93242
            * targhooks.c (default_print_patchable_function_entry): use
            output_asm_insn to emit the nop instruction.

Diff:
---
 gcc/targhooks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index aaf536acf17..185dc7b0b6b 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1655,7 +1655,7 @@ default_print_patchable_function_entry (FILE *file,
 
   unsigned i;
   for (i = 0; i < patch_area_size; ++i)
-    fprintf (file, "\t%s\n", nop_templ);
+    output_asm_insn (nop_templ, NULL);
 }
 
 bool