diff options
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 25 | ||||
| -rw-r--r-- | libgcc/config/xtensa/crti.S | 2 | ||||
| -rw-r--r-- | libgcc/config/xtensa/crtn.S | 2 | ||||
| -rw-r--r-- | libgcc/config/xtensa/lib1funcs.S | 2 | ||||
| -rw-r--r-- | libgcc/config/xtensa/lib2funcs.S | 2 | ||||
| -rw-r--r-- | libgcc/config/xtensa/xtensa-config-builtin.h | 198 | ||||
| -rw-r--r-- | libgcc/unwind-dw2-fde-dip.c | 58 |
7 files changed, 273 insertions, 16 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 658ee22..03119bb 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,24 @@ +2022-12-08 Max Filippov <jcmvbkbc@gmail.com> + + * config/xtensa/xtensa-config-builtin.h (XCHAL_NUM_AREGS) + (XCHAL_ICACHE_SIZE, XCHAL_DCACHE_SIZE, XCHAL_ICACHE_LINESIZE) + (XCHAL_DCACHE_LINESIZE, XCHAL_MMU_MIN_PTE_PAGE_SIZE) + (XSHAL_ABI): Remove stray symbols from macro definitions. + +2022-12-07 Max Filippov <jcmvbkbc@gmail.com> + + * config/xtensa/crti.S (xtensa-config.h): Replace #inlcude with + xtensa-config-builtin.h. + * config/xtensa/crtn.S: Likewise. + * config/xtensa/lib1funcs.S: Likewise. + * config/xtensa/lib2funcs.S: Likewise. + * config/xtensa/xtensa-config-builtin.h: New File. + +2022-11-04 Florian Weimer <fweimer@redhat.com> + + * unwind-dw2-fde-dip.c (find_fde_tail): Special-case encoding + values actually used by BFD ld. + 2022-10-23 LIU Hao <lh_mouse@126.com> * config/i386/gthr-mcf.h: Include 'gthr_libobjc.h' when building @@ -5925,7 +5946,7 @@ for CUSTOM_CRTSTUFF. * config.host (i[34567]86-*-cygwin*, x86_64-*-cygwin*, i[34567]86-*-mingw*) - (x86_64-*-mingw*): Only add vtv_*.o to extra_parts if + (x86_64-*-mingw*): Only add vtv_*.o to extra_parts if enable_vtable_verify. 2015-01-27 Nick Clifton <nickc@redhat.com> @@ -7249,7 +7270,7 @@ 2013-12-31 Sandra Loosemore <sandra@codesourcery.com> Chung-Lin Tang <cltang@codesourcery.com> - Based on patches from Altera Corporation + Based on patches from Altera Corporation * config.host (nios2-*-*,nios2-*-linux*): Add nios2 host cases. * config/nios2/lib2-nios2.h: New file. diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S index 3de7bc1..2452a88 100644 --- a/libgcc/config/xtensa/crti.S +++ b/libgcc/config/xtensa/crti.S @@ -24,7 +24,7 @@ # .init sections. Users may put any desired instructions in those # sections. -#include "xtensa-config.h" +#include "xtensa-config-builtin.h" .section .init .globl _init diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S index 06b932e..8520945 100644 --- a/libgcc/config/xtensa/crtn.S +++ b/libgcc/config/xtensa/crtn.S @@ -25,7 +25,7 @@ # fact return. Users may put any desired instructions in those sections. # This file is the last thing linked into any executable. -#include "xtensa-config.h" +#include "xtensa-config-builtin.h" .section .init #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S index 3932d20..e5a35aa 100644 --- a/libgcc/config/xtensa/lib1funcs.S +++ b/libgcc/config/xtensa/lib1funcs.S @@ -23,7 +23,7 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see <http://www.gnu.org/licenses/>. */ -#include "xtensa-config.h" +#include "xtensa-config-builtin.h" /* Define macros for the ABS and ADDX* instructions to handle cases where they are not included in the Xtensa processor configuration. */ diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S index 681bac1..ef2a832 100644 --- a/libgcc/config/xtensa/lib2funcs.S +++ b/libgcc/config/xtensa/lib2funcs.S @@ -23,7 +23,7 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see <http://www.gnu.org/licenses/>. */ -#include "xtensa-config.h" +#include "xtensa-config-builtin.h" /* __xtensa_libgcc_window_spill: This function flushes out all but the current register window. This is used to set up the stack so that diff --git a/libgcc/config/xtensa/xtensa-config-builtin.h b/libgcc/config/xtensa/xtensa-config-builtin.h new file mode 100644 index 0000000..47782a0 --- /dev/null +++ b/libgcc/config/xtensa/xtensa-config-builtin.h @@ -0,0 +1,198 @@ +/* Xtensa configuration settings. + Copyright (C) 2022 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef XTENSA_CONFIG_BUILTIN_H +#define XTENSA_CONFIG_BUILTIN_H + +/* The macros defined here match those with the same names in the Xtensa + compile-time HAL (Hardware Abstraction Layer). Please refer to the + Xtensa System Software Reference Manual for documentation of these + macros. */ + +#undef XCHAL_HAVE_BE +#define XCHAL_HAVE_BE __XCHAL_HAVE_BE + +#undef XCHAL_HAVE_DENSITY +#define XCHAL_HAVE_DENSITY __XCHAL_HAVE_DENSITY + +#undef XCHAL_HAVE_CONST16 +#define XCHAL_HAVE_CONST16 __XCHAL_HAVE_CONST16 + +#undef XCHAL_HAVE_ABS +#define XCHAL_HAVE_ABS __XCHAL_HAVE_ABS + +#undef XCHAL_HAVE_ADDX +#define XCHAL_HAVE_ADDX __XCHAL_HAVE_ADDX + +#undef XCHAL_HAVE_L32R +#define XCHAL_HAVE_L32R __XCHAL_HAVE_L32R + +#undef XSHAL_USE_ABSOLUTE_LITERALS +#define XSHAL_USE_ABSOLUTE_LITERALS __XSHAL_USE_ABSOLUTE_LITERALS + +#undef XSHAL_HAVE_TEXT_SECTION_LITERALS +#define XSHAL_HAVE_TEXT_SECTION_LITERALS __XSHAL_HAVE_TEXT_SECTION_LITERALS + +#undef XCHAL_HAVE_MAC16 +#define XCHAL_HAVE_MAC16 __XCHAL_HAVE_MAC16 + +#undef XCHAL_HAVE_MUL16 +#define XCHAL_HAVE_MUL16 __XCHAL_HAVE_MUL16 + +#undef XCHAL_HAVE_MUL32 +#define XCHAL_HAVE_MUL32 __XCHAL_HAVE_MUL32 + +#undef XCHAL_HAVE_MUL32_HIGH +#define XCHAL_HAVE_MUL32_HIGH __XCHAL_HAVE_MUL32_HIGH + +#undef XCHAL_HAVE_DIV32 +#define XCHAL_HAVE_DIV32 __XCHAL_HAVE_DIV32 + +#undef XCHAL_HAVE_NSA +#define XCHAL_HAVE_NSA __XCHAL_HAVE_NSA + +#undef XCHAL_HAVE_MINMAX +#define XCHAL_HAVE_MINMAX __XCHAL_HAVE_MINMAX + +#undef XCHAL_HAVE_SEXT +#define XCHAL_HAVE_SEXT __XCHAL_HAVE_SEXT + +#undef XCHAL_HAVE_LOOPS +#define XCHAL_HAVE_LOOPS __XCHAL_HAVE_LOOPS + +#undef XCHAL_HAVE_THREADPTR +#define XCHAL_HAVE_THREADPTR __XCHAL_HAVE_THREADPTR + +#undef XCHAL_HAVE_RELEASE_SYNC +#define XCHAL_HAVE_RELEASE_SYNC __XCHAL_HAVE_RELEASE_SYNC + +#undef XCHAL_HAVE_S32C1I +#define XCHAL_HAVE_S32C1I __XCHAL_HAVE_S32C1I + +#undef XCHAL_HAVE_BOOLEANS +#define XCHAL_HAVE_BOOLEANS __XCHAL_HAVE_BOOLEANS + +#undef XCHAL_HAVE_FP +#define XCHAL_HAVE_FP __XCHAL_HAVE_FP + +#undef XCHAL_HAVE_FP_DIV +#define XCHAL_HAVE_FP_DIV __XCHAL_HAVE_FP_DIV + +#undef XCHAL_HAVE_FP_RECIP +#define XCHAL_HAVE_FP_RECIP __XCHAL_HAVE_FP_RECIP + +#undef XCHAL_HAVE_FP_SQRT +#define XCHAL_HAVE_FP_SQRT __XCHAL_HAVE_FP_SQRT + +#undef XCHAL_HAVE_FP_RSQRT +#define XCHAL_HAVE_FP_RSQRT __XCHAL_HAVE_FP_RSQRT + +#undef XCHAL_HAVE_FP_POSTINC +#define XCHAL_HAVE_FP_POSTINC __XCHAL_HAVE_FP_POSTINC + +#undef XCHAL_HAVE_DFP +#define XCHAL_HAVE_DFP __XCHAL_HAVE_DFP + +#undef XCHAL_HAVE_DFP_DIV +#define XCHAL_HAVE_DFP_DIV __XCHAL_HAVE_DFP_DIV + +#undef XCHAL_HAVE_DFP_RECIP +#define XCHAL_HAVE_DFP_RECIP __XCHAL_HAVE_DFP_RECIP + +#undef XCHAL_HAVE_DFP_SQRT +#define XCHAL_HAVE_DFP_SQRT __XCHAL_HAVE_DFP_SQRT + +#undef XCHAL_HAVE_DFP_RSQRT +#define XCHAL_HAVE_DFP_RSQRT __XCHAL_HAVE_DFP_RSQRT + +#undef XCHAL_HAVE_WINDOWED +#define XCHAL_HAVE_WINDOWED __XCHAL_HAVE_WINDOWED + +#undef XCHAL_NUM_AREGS +#define XCHAL_NUM_AREGS __XCHAL_NUM_AREGS + +#undef XCHAL_HAVE_WIDE_BRANCHES +#define XCHAL_HAVE_WIDE_BRANCHES __XCHAL_HAVE_WIDE_BRANCHES + +#undef XCHAL_HAVE_PREDICTED_BRANCHES +#define XCHAL_HAVE_PREDICTED_BRANCHES __XCHAL_HAVE_PREDICTED_BRANCHES + + +#undef XCHAL_ICACHE_SIZE +#define XCHAL_ICACHE_SIZE __XCHAL_ICACHE_SIZE + +#undef XCHAL_DCACHE_SIZE +#define XCHAL_DCACHE_SIZE __XCHAL_DCACHE_SIZE + +#undef XCHAL_ICACHE_LINESIZE +#define XCHAL_ICACHE_LINESIZE __XCHAL_ICACHE_LINESIZE + +#undef XCHAL_DCACHE_LINESIZE +#define XCHAL_DCACHE_LINESIZE __XCHAL_DCACHE_LINESIZE + +#undef XCHAL_ICACHE_LINEWIDTH +#define XCHAL_ICACHE_LINEWIDTH __XCHAL_ICACHE_LINEWIDTH + +#undef XCHAL_DCACHE_LINEWIDTH +#define XCHAL_DCACHE_LINEWIDTH __XCHAL_DCACHE_LINEWIDTH + +#undef XCHAL_DCACHE_IS_WRITEBACK +#define XCHAL_DCACHE_IS_WRITEBACK __XCHAL_DCACHE_IS_WRITEBACK + + +#undef XCHAL_HAVE_MMU +#define XCHAL_HAVE_MMU __XCHAL_HAVE_MMU + +#undef XCHAL_MMU_MIN_PTE_PAGE_SIZE +#define XCHAL_MMU_MIN_PTE_PAGE_SIZE __XCHAL_MMU_MIN_PTE_PAGE_SIZE + + +#undef XCHAL_HAVE_DEBUG +#define XCHAL_HAVE_DEBUG __XCHAL_HAVE_DEBUG + +#undef XCHAL_NUM_IBREAK +#define XCHAL_NUM_IBREAK __XCHAL_NUM_IBREAK + +#undef XCHAL_NUM_DBREAK +#define XCHAL_NUM_DBREAK __XCHAL_NUM_DBREAK + +#undef XCHAL_DEBUGLEVEL +#define XCHAL_DEBUGLEVEL __XCHAL_DEBUGLEVEL + + +#undef XCHAL_MAX_INSTRUCTION_SIZE +#define XCHAL_MAX_INSTRUCTION_SIZE __XCHAL_MAX_INSTRUCTION_SIZE + +#undef XCHAL_INST_FETCH_WIDTH +#define XCHAL_INST_FETCH_WIDTH __XCHAL_INST_FETCH_WIDTH + + +#undef XSHAL_ABI +#undef XTHAL_ABI_WINDOWED +#undef XTHAL_ABI_CALL0 +#define XSHAL_ABI __XSHAL_ABI +#define XTHAL_ABI_WINDOWED __XTHAL_ABI_WINDOWED +#define XTHAL_ABI_CALL0 __XTHAL_ABI_CALL0 + +#endif /* !XTENSA_CONFIG_BUILTIN_H */ diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index 7f9be5e..f370c12 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -396,10 +396,21 @@ find_fde_tail (_Unwind_Ptr pc, if (hdr->version != 1) return NULL; - p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, - base_from_cb_data (hdr->eh_frame_ptr_enc, - dbase), - p, &eh_frame); + if (__builtin_expect (hdr->eh_frame_ptr_enc == (DW_EH_PE_sdata4 + | DW_EH_PE_pcrel), 1)) + { + /* Specialized version of read_encoded_value_with_base, based on what + BFD ld generates. */ + signed value __attribute__ ((mode (SI))); + memcpy (&value, p, sizeof (value)); + p += sizeof (value); + dbase = value; /* No adjustment because pcrel has base 0. */ + } + else + p = read_encoded_value_with_base (hdr->eh_frame_ptr_enc, + base_from_cb_data (hdr->eh_frame_ptr_enc, + dbase), + p, &eh_frame); /* We require here specific table encoding to speed things up. Also, DW_EH_PE_datarel here means using PT_GNU_EH_FRAME start @@ -409,10 +420,20 @@ find_fde_tail (_Unwind_Ptr pc, { _Unwind_Ptr fde_count; - p = read_encoded_value_with_base (hdr->fde_count_enc, - base_from_cb_data (hdr->fde_count_enc, - dbase), - p, &fde_count); + if (__builtin_expect (hdr->fde_count_enc == DW_EH_PE_udata4, 1)) + { + /* Specialized version of read_encoded_value_with_base, based on + what BFD ld generates. */ + unsigned value __attribute__ ((mode (SI))); + memcpy (&value, p, sizeof (value)); + p += sizeof (value); + fde_count = value; + } + else + p = read_encoded_value_with_base (hdr->fde_count_enc, + base_from_cb_data (hdr->fde_count_enc, + dbase), + p, &fde_count); /* Shouldn't happen. */ if (fde_count == 0) return NULL; @@ -454,8 +475,25 @@ find_fde_tail (_Unwind_Ptr pc, f = (fde *) (table[mid].fde + data_base); f_enc = get_fde_encoding (f); f_enc_size = size_of_encoded_value (f_enc); - read_encoded_value_with_base (f_enc & 0x0f, 0, - &f->pc_begin[f_enc_size], &range); + + /* BFD ld uses DW_EH_PE_sdata4 | DW_EH_PE_pcrel on non-FDPIC targets, + so optimize for that. + + This optimization is not valid for FDPIC targets. f_enc & 0x0f as + passed to read_encoded_value_with_base masks away the base flags, + but they are implicit for FDPIC. */ +#ifndef __FDPIC__ + if (__builtin_expect (f_enc == (DW_EH_PE_sdata4 | DW_EH_PE_pcrel), + 1)) + { + signed value __attribute__ ((mode (SI))); + memcpy (&value, &f->pc_begin[f_enc_size], sizeof (value)); + range = value; + } + else +#endif + read_encoded_value_with_base (f_enc & 0x0f, 0, + &f->pc_begin[f_enc_size], &range); _Unwind_Ptr func = table[mid].initial_loc + data_base; if (pc < table[mid].initial_loc + data_base + range) { |