diff options
3 files changed, 33 insertions, 80 deletions
diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-PR-target-83013.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-PR-target-83013.patch new file mode 100644 index 00000000..42bfd3c1 --- /dev/null +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-PR-target-83013.patch @@ -0,0 +1,32 @@ +From f17cdebf4e0defaefce927176ddeb9717de073d2 Mon Sep 17 00:00:00 2001 +From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Mon, 15 Jan 2018 06:02:19 +0000 +Subject: [PATCH] PR target/83013 + + * config/microblaze/microblaze.c (microblaze_asm_output_ident): + Use .pushsection/.popsection. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@256681 138bc75d-0d04-0410-961f-82ee72b054a4 +Upstream-Status: Backport [backport from trunk pre-release v8] +--- + gcc/config/microblaze/microblaze.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c +index d0f86fd460..a98aca1235 100644 +--- a/gcc/config/microblaze/microblaze.c ++++ b/gcc/config/microblaze/microblaze.c +@@ -3371,7 +3371,9 @@ microblaze_asm_output_ident (const char *string) + else + section_asm_op = READONLY_DATA_SECTION_ASM_OP; + +- buf = ACONCAT ((section_asm_op, "\n\t.ascii \"", string, "\\0\"\n", NULL)); ++ buf = ACONCAT (("\t.pushsection", section_asm_op, ++ "\n\t.ascii \"", string, "\\0\"\n", ++ "\t.popsection\n", NULL)); + symtab->finalize_toplevel_asm (build_string (strlen (buf), buf)); + } + +-- +2.15.1 + diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-gcc-config-microblaze-Use-default-ident-output-gener.patch b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-gcc-config-microblaze-Use-default-ident-output-gener.patch deleted file mode 100644 index 9a310ab8..00000000 --- a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-7/0003-gcc-config-microblaze-Use-default-ident-output-gener.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 89b0d852718f0ad2b48899880c2bc1e5dc979704 Mon Sep 17 00:00:00 2001 -From: Nathan Rossi <nathan@nathanrossi.com> -Date: Sat, 27 May 2017 00:00:17 +1000 -Subject: [PATCH] gcc/config/microblaze: Use default ident output generation - -Remove the MicroBlaze specific TARGET_ASM_OUTPUT_IDENT definition, and -use the default. - -Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> -Upstream-Status: Unsubmitted ---- - gcc/config/microblaze/microblaze-protos.h | 1 - - gcc/config/microblaze/microblaze.c | 24 ------------------------ - gcc/config/microblaze/microblaze.h | 2 +- - 3 files changed, 1 insertion(+), 26 deletions(-) - -diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h -index 9ba8f2d46f..b56e052ae4 100644 ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -51,7 +51,6 @@ extern int microblaze_regno_ok_for_base_p (int, int); - extern HOST_WIDE_INT microblaze_initial_elimination_offset (int, int); - extern void microblaze_declare_object (FILE *, const char *, const char *, - const char *, int); --extern void microblaze_asm_output_ident (const char *); - extern int microblaze_legitimate_pic_operand (rtx); - extern bool microblaze_tls_referenced_p (rtx); - extern int symbol_mentioned_p (rtx); -diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c -index d0f86fd460..bba6983b65 100644 ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -3351,30 +3351,6 @@ microblaze_eh_return (rtx op0) - emit_insn (gen_movsi (gen_rtx_MEM (Pmode, stack_pointer_rtx), op0)); - } - --/* Queue an .ident string in the queue of top-level asm statements. -- If the string size is below the threshold, put it into .sdata2. -- If the front-end is done, we must be being called from toplev.c. -- In that case, do nothing. */ --void --microblaze_asm_output_ident (const char *string) --{ -- const char *section_asm_op; -- int size; -- char *buf; -- -- if (symtab->state != PARSING) -- return; -- -- size = strlen (string) + 1; -- if (size <= microblaze_section_threshold) -- section_asm_op = SDATA2_SECTION_ASM_OP; -- else -- section_asm_op = READONLY_DATA_SECTION_ASM_OP; -- -- buf = ACONCAT ((section_asm_op, "\n\t.ascii \"", string, "\\0\"\n", NULL)); -- symtab->finalize_toplevel_asm (build_string (strlen (buf), buf)); --} -- - static void - microblaze_elf_asm_init_sections (void) - { -diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h -index 2c9ece1d6c..ccd77e8b4d 100644 ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -743,7 +743,7 @@ do { \ - #define STRING_ASM_OP "\t.asciz\t" - - #undef TARGET_ASM_OUTPUT_IDENT --#define TARGET_ASM_OUTPUT_IDENT microblaze_asm_output_ident -+#define TARGET_ASM_OUTPUT_IDENT default_asm_output_ident_directive - - /* Default to -G 8 */ - #ifndef MICROBLAZE_DEFAULT_GVALUE --- -2.14.2 - diff --git a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_7.%.bbappend b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_7.%.bbappend index d6b69001..9770af61 100644 --- a/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_7.%.bbappend +++ b/meta-xilinx-bsp/recipes-microblaze/gcc/gcc-source_7.%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS_append_microblaze := "${THISDIR}/gcc-7:" SRC_URI_append_microblaze = " \ file://0001-Revert.patch \ file://0002-microblaze.md-Improve-adddi3-and-subdi3-insn-definit.patch \ - file://0003-gcc-config-microblaze-Use-default-ident-output-gener.patch \ + file://0003-PR-target-83013.patch \ file://0004-dejagnu-static-testing-on-qemu-suppress-warnings.patch \ file://0005-Testsuite-explicitly-add-fivopts-for-tests-that-depe.patch \ file://0006-Add-MicroBlaze-to-target-supports-for-atomic-builtin.patch \ |