Message ID | 20211203213348.406058-1-dimitar@dinux.eu |
---|---|
State | New |
Headers | show |
Series | pru: Fixup flags for .pru_irq_map section | expand |
On Fri, Dec 03, 2021 at 11:33:48PM +0200, Dimitar Dimitrov wrote: > I intend to merge this patch next week, unless I hear objections. I > consider it a bug fix which fits the Stage 3 criteria. It fixes the > RPMSG firmware examples in the latest version 6.0 of TI's PRU Software > Package. > > The .pru_irq_map section has been introduced by Linux kernel 5.10: > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c75c9fdac66efd8b54773368254ef330c276171b > This section must not be loaded into target memory. > > Binutils already includes the corresponding fix in the linker script: > https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=44b357eb9aefc77a8385e631d8e3035a664f2333 > > gcc/ChangeLog: > > * config/pru/pru.c (pru_section_type_flags): New function. > (TARGET_SECTION_TYPE_FLAGS): Wire it. > > gcc/testsuite/ChangeLog: > > * gcc.target/pru/pru_irq_map.c: New test. > > Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu> Committed.
diff --git a/gcc/config/pru/pru.c b/gcc/config/pru/pru.c index 9f264b4698d..01d283fd9e7 100644 --- a/gcc/config/pru/pru.c +++ b/gcc/config/pru/pru.c @@ -2022,6 +2022,23 @@ pru_assemble_integer (rtx x, unsigned int size, int aligned_p) } } +/* Implement TARGET_SECTION_TYPE_FLAGS. */ + +static unsigned int +pru_section_type_flags (tree decl, const char *name, int reloc) +{ + unsigned int flags = default_section_type_flags (decl, name, reloc); + + /* The .pru_irq_map section is not meant to be loaded into the target + memory. Instead its contents are read by the host remoteproc loader. + To prevent being marked as a loadable (allocated) section, the + .pru_irq_map section is intercepted and marked as a debug section. */ + if (!strcmp (name, ".pru_irq_map")) + flags = SECTION_DEBUG | SECTION_RETAIN; + + return flags; +} + /* Implement TARGET_ASM_FILE_START. */ static void @@ -3071,6 +3088,8 @@ pru_unwind_word_mode (void) #define TARGET_ASM_FUNCTION_PROLOGUE pru_asm_function_prologue #undef TARGET_ASM_INTEGER #define TARGET_ASM_INTEGER pru_assemble_integer +#undef TARGET_SECTION_TYPE_FLAGS +#define TARGET_SECTION_TYPE_FLAGS pru_section_type_flags #undef TARGET_ASM_FILE_START #define TARGET_ASM_FILE_START pru_file_start diff --git a/gcc/testsuite/gcc.target/pru/pru_irq_map.c b/gcc/testsuite/gcc.target/pru/pru_irq_map.c new file mode 100644 index 00000000000..4f9a5e71b01 --- /dev/null +++ b/gcc/testsuite/gcc.target/pru/pru_irq_map.c @@ -0,0 +1,8 @@ +/* Test the special handling of .pru_irq_map section. */ + +/* { dg-do compile } */ + +int my_int_map __attribute__((section(".pru_irq_map"))); + +/* Section must not have the allocated flag. */ +/* { dg-final { scan-assembler "\.section\[ \t\]+.pru_irq_map,\[ \]*\"\",[ ]*@progbits" } } */
I intend to merge this patch next week, unless I hear objections. I consider it a bug fix which fits the Stage 3 criteria. It fixes the RPMSG firmware examples in the latest version 6.0 of TI's PRU Software Package. The .pru_irq_map section has been introduced by Linux kernel 5.10: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c75c9fdac66efd8b54773368254ef330c276171b This section must not be loaded into target memory. Binutils already includes the corresponding fix in the linker script: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=44b357eb9aefc77a8385e631d8e3035a664f2333 gcc/ChangeLog: * config/pru/pru.c (pru_section_type_flags): New function. (TARGET_SECTION_TYPE_FLAGS): Wire it. gcc/testsuite/ChangeLog: * gcc.target/pru/pru_irq_map.c: New test. Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu> --- gcc/config/pru/pru.c | 19 +++++++++++++++++++ gcc/testsuite/gcc.target/pru/pru_irq_map.c | 8 ++++++++ 2 files changed, 27 insertions(+) create mode 100644 gcc/testsuite/gcc.target/pru/pru_irq_map.c