diff mbox series

Synchronize include/dwarf2.def with binutils

Message ID 001f01db7bd7$d8a66450$89f32cf0$@nextmovesoftware.com
State Committed
Commit 0f8fd6b336161ed0582edb08dbe6ea1932290a75
Headers
Series Synchronize include/dwarf2.def with binutils |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-aarch64-bootstrap success Build passed
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-arm-bootstrap success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

Roger Sayle Feb. 10, 2025, 4:21 p.m. UTC 
  The contents of include/dwarf2.def have diverged between the gcc and
the binutils repositories.  Currently, it's impossible to build a combined
tree, as GCC won't build with the binutils version of dwarf2.def and
binutils
won't build with the gcc version.  This patch realigns this file by copying
the definition of DW_CFA_AARCH64_negate_ra_state_with_pc from binutils,
restoring the ability to build a combined source tree.

Tested on x86_64-pc-linux-gnu with "make bootstrap".
Ok for mainline?


2025-02-10  Roger Sayle  <roger@nextmovesoftware.com>

include/ChangeLog
        * dwarf2.def(DW_CFA_AARCH64_negate_ra_state_with_pc): Define.


Thanks in advance,
Roger
--

Comments

Jakub Jelinek Feb. 11, 2025, 11:15 a.m. UTC | #1 
On Mon, Feb 10, 2025 at 04:21:28PM -0000, Roger Sayle wrote:
> 2025-02-10  Roger Sayle  <roger@nextmovesoftware.com>
> 
> include/ChangeLog
>         * dwarf2.def(DW_CFA_AARCH64_negate_ra_state_with_pc): Define.

Space after def

Ok for trunk with that nit fixed.

> diff --git a/include/dwarf2.def b/include/dwarf2.def
> index e9acb79df9c..989f078041d 100644
> --- a/include/dwarf2.def
> +++ b/include/dwarf2.def
> @@ -788,6 +788,8 @@ DW_CFA (DW_CFA_hi_user, 0x3f)
>  
>  /* SGI/MIPS specific.  */
>  DW_CFA (DW_CFA_MIPS_advance_loc8, 0x1d)
> +/* AArch64 extensions.  */
> +DW_CFA (DW_CFA_AARCH64_negate_ra_state_with_pc, 0x2c)
>  /* GNU extensions.
>     NOTE: DW_CFA_GNU_window_save is multiplexed on Sparc and AArch64.  */
>  DW_CFA (DW_CFA_GNU_window_save, 0x2d)


	Jakub
diff mbox series

Patch

diff --git a/include/dwarf2.def b/include/dwarf2.def
index e9acb79df9c..989f078041d 100644
--- a/include/dwarf2.def
+++ b/include/dwarf2.def
@@ -788,6 +788,8 @@  DW_CFA (DW_CFA_hi_user, 0x3f)
 
 /* SGI/MIPS specific.  */
 DW_CFA (DW_CFA_MIPS_advance_loc8, 0x1d)
+/* AArch64 extensions.  */
+DW_CFA (DW_CFA_AARCH64_negate_ra_state_with_pc, 0x2c)
 /* GNU extensions.
    NOTE: DW_CFA_GNU_window_save is multiplexed on Sparc and AArch64.  */
 DW_CFA (DW_CFA_GNU_window_save, 0x2d)