diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2020-02-10 12:54:39 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2020-02-10 14:35:31 +0000 |
| commit | 5602b48b2ed84feb1a5792e3d73b00b42138ca6e (patch) | |
| tree | e0722d935f63534607e8545b39c63b843db2397e /libgcc | |
| parent | 13686ecef23bcfe9443a0755c73a19d677b786bd (diff) | |
arm: Fix up arm installed unwind.h for use in pedantic modes [PR93615]
Commit r10-6500-g811a475ea3fcc55ee4aea7c81171891ef19dfc25 broke the
GCC build for arm-none-uclinuxfdpiceabi, as it forgot to update some
uses of gnu_Unwind_Find_got.
2020-02-10 Christophe Lyon <christophe.lyon@linaro.org>
libgcc/
PR target/93615
* unwind-arm-common.inc: Replace uses of gnu_Unwind_Find_got with
_Unwind_gnu_Find_got.
* unwind-pe.h: Likewise.
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 7 | ||||
| -rw-r--r-- | libgcc/unwind-arm-common.inc | 8 | ||||
| -rw-r--r-- | libgcc/unwind-pe.h | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b6e5ffc640d..4fd1297fdbf 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2020-02-10 Christophe Lyon <christophe.lyon@linaro.org> + + PR target/93615 + * unwind-arm-common.inc: Replace uses of gnu_Unwind_Find_got with + _Unwind_gnu_Find_got. + * unwind-pe.h: Likewise. + 2020-02-07 Jakub Jelinek <jakub@redhat.com> PR target/93615 diff --git a/libgcc/unwind-arm-common.inc b/libgcc/unwind-arm-common.inc index 3c774b8ac42..31a072b9b9b 100644 --- a/libgcc/unwind-arm-common.inc +++ b/libgcc/unwind-arm-common.inc @@ -419,7 +419,7 @@ get_eit_entry (_Unwind_Control_Block *ucbp, _uw return_address) UCB_PR_ADDR (ucbp) = selfrel_offset31 (ucbp->pr_cache.ehtp); #if __FDPIC__ UCB_PR_GOT (ucbp) - = (unsigned int) gnu_Unwind_Find_got ((_Unwind_Ptr) UCB_PR_ADDR (ucbp)); + = (unsigned int) _Unwind_gnu_Find_got ((_Unwind_Ptr) UCB_PR_ADDR (ucbp)); #endif } return _URC_OK; @@ -462,7 +462,7 @@ unwind_phase2 (_Unwind_Control_Block * ucbp, phase2_vrs * vrs) #if __FDPIC__ /* r9 could have been lost due to PLT jump. Restore correct value. */ - vrs->core.r[FDPIC_REGNUM] = gnu_Unwind_Find_got (VRS_PC (vrs)); + vrs->core.r[FDPIC_REGNUM] = _Unwind_gnu_Find_got (VRS_PC (vrs)); #endif uw_restore_core_regs (vrs, &vrs->core); @@ -562,7 +562,7 @@ unwind_phase2_forced (_Unwind_Control_Block *ucbp, phase2_vrs *entry_vrs, #if __FDPIC__ /* r9 could have been lost due to PLT jump. Restore correct value. */ - saved_vrs.core.r[FDPIC_REGNUM] = gnu_Unwind_Find_got (VRS_PC (&saved_vrs)); + saved_vrs.core.r[FDPIC_REGNUM] = _Unwind_gnu_Find_got (VRS_PC (&saved_vrs)); #endif uw_restore_core_regs (&saved_vrs, &saved_vrs.core); @@ -698,7 +698,7 @@ __gnu_Unwind_Resume (_Unwind_Control_Block * ucbp, phase2_vrs * entry_vrs) /* Upload the registers to enter the landing pad. */ #if __FDPIC__ /* r9 could have been lost due to PLT jump. Restore correct value. */ - entry_vrs->core.r[FDPIC_REGNUM] = gnu_Unwind_Find_got (VRS_PC (entry_vrs)); + entry_vrs->core.r[FDPIC_REGNUM] = _Unwind_gnu_Find_got (VRS_PC (entry_vrs)); #endif uw_restore_core_regs (entry_vrs, &entry_vrs->core); diff --git a/libgcc/unwind-pe.h b/libgcc/unwind-pe.h index a3361275bc2..a6b4bffa944 100644 --- a/libgcc/unwind-pe.h +++ b/libgcc/unwind-pe.h @@ -267,7 +267,7 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base, into account. */ if ((encoding & DW_EH_PE_pcrel) && (encoding & DW_EH_PE_indirect)) { - result += gnu_Unwind_Find_got ((_Unwind_Ptr) u); + result += _Unwind_gnu_Find_got ((_Unwind_Ptr) u); result = *(_Unwind_Internal_Ptr *) result; } else |