Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392a0fc9 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: merge dwarf2 headers 



Merge dwarf2_32.h and dwarf2_64.h into dwarf2.h.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d73a731a

include/asm-x86/dwarf2.h

+59 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "dwarf2_32.h"

#ifndef _DWARF2_H

#define _DWARF2_H



#ifndef __ASSEMBLY__

#warning "asm/dwarf2.h should be only included in pure assembly files"

#endif



/*

   Macros for dwarf2 CFI unwind table entries.

   See "as.info" for details on these pseudo ops. Unfortunately

   they are only supported in very new binutils, so define them

   away for older version.

 */



#ifdef CONFIG_AS_CFI



#define CFI_STARTPROC .cfi_startproc

#define CFI_ENDPROC .cfi_endproc

#define CFI_DEF_CFA .cfi_def_cfa

#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register

#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset

#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset

#define CFI_OFFSET .cfi_offset

#define CFI_REL_OFFSET .cfi_rel_offset

#define CFI_REGISTER .cfi_register

#define CFI_RESTORE .cfi_restore

#define CFI_REMEMBER_STATE .cfi_remember_state

#define CFI_RESTORE_STATE .cfi_restore_state

#define CFI_UNDEFINED .cfi_undefined



#ifdef CONFIG_AS_CFI_SIGNAL_FRAME

#define CFI_SIGNAL_FRAME .cfi_signal_frame

#else

#define CFI_SIGNAL_FRAME

#endif



#else

# include "dwarf2_64.h"



/* Due to the structure of pre-exisiting code, don't use assembler line

   comment character # to ignore the arguments. Instead, use a dummy macro. */

.macro ignore a=0, b=0, c=0, d=0

.endm



#define CFI_STARTPROC	ignore

#define CFI_ENDPROC	ignore

#define CFI_DEF_CFA	ignore

#define CFI_DEF_CFA_REGISTER	ignore

#define CFI_DEF_CFA_OFFSET	ignore

#define CFI_ADJUST_CFA_OFFSET	ignore

#define CFI_OFFSET	ignore

#define CFI_REL_OFFSET	ignore

#define CFI_REGISTER	ignore

#define CFI_RESTORE	ignore

#define CFI_REMEMBER_STATE ignore

#define CFI_RESTORE_STATE ignore

#define CFI_UNDEFINED ignore

#define CFI_SIGNAL_FRAME ignore



#endif



#endif

include/asm-x86/dwarf2_32.h

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
#ifndef _DWARF2_H

#define _DWARF2_H



#ifndef __ASSEMBLY__

#warning "asm/dwarf2.h should be only included in pure assembly files"

#endif



/*

   Macros for dwarf2 CFI unwind table entries.

   See "as.info" for details on these pseudo ops. Unfortunately

   they are only supported in very new binutils, so define them

   away for older version.

 */



#ifdef CONFIG_AS_CFI



#define CFI_STARTPROC .cfi_startproc

#define CFI_ENDPROC .cfi_endproc

#define CFI_DEF_CFA .cfi_def_cfa

#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register

#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset

#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset

#define CFI_OFFSET .cfi_offset

#define CFI_REL_OFFSET .cfi_rel_offset

#define CFI_REGISTER .cfi_register

#define CFI_RESTORE .cfi_restore

#define CFI_REMEMBER_STATE .cfi_remember_state

#define CFI_RESTORE_STATE .cfi_restore_state

#define CFI_UNDEFINED .cfi_undefined



#ifdef CONFIG_AS_CFI_SIGNAL_FRAME

#define CFI_SIGNAL_FRAME .cfi_signal_frame

#else

#define CFI_SIGNAL_FRAME

#endif



#else



/* Due to the structure of pre-exisiting code, don't use assembler line

   comment character # to ignore the arguments. Instead, use a dummy macro. */

.macro ignore a=0, b=0, c=0, d=0

.endm



#define CFI_STARTPROC	ignore

#define CFI_ENDPROC	ignore

#define CFI_DEF_CFA	ignore

#define CFI_DEF_CFA_REGISTER	ignore

#define CFI_DEF_CFA_OFFSET	ignore

#define CFI_ADJUST_CFA_OFFSET	ignore

#define CFI_OFFSET	ignore

#define CFI_REL_OFFSET	ignore

#define CFI_REGISTER	ignore

#define CFI_RESTORE	ignore

#define CFI_REMEMBER_STATE ignore

#define CFI_RESTORE_STATE ignore

#define CFI_UNDEFINED ignore

#define CFI_SIGNAL_FRAME ignore



#endif



#endif

include/asm-x86/dwarf2_64.h

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
#ifndef _DWARF2_H

#define _DWARF2_H 1



#ifndef __ASSEMBLY__

#warning "asm/dwarf2.h should be only included in pure assembly files"

#endif



/*

   Macros for dwarf2 CFI unwind table entries.

   See "as.info" for details on these pseudo ops. Unfortunately

   they are only supported in very new binutils, so define them

   away for older version.

 */



#ifdef CONFIG_AS_CFI



#define CFI_STARTPROC .cfi_startproc

#define CFI_ENDPROC .cfi_endproc

#define CFI_DEF_CFA .cfi_def_cfa

#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register

#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset

#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset

#define CFI_OFFSET .cfi_offset

#define CFI_REL_OFFSET .cfi_rel_offset

#define CFI_REGISTER .cfi_register

#define CFI_RESTORE .cfi_restore

#define CFI_REMEMBER_STATE .cfi_remember_state

#define CFI_RESTORE_STATE .cfi_restore_state

#define CFI_UNDEFINED .cfi_undefined

#ifdef CONFIG_AS_CFI_SIGNAL_FRAME

#define CFI_SIGNAL_FRAME .cfi_signal_frame

#else

#define CFI_SIGNAL_FRAME

#endif



#else



.macro ignore a=0, b=0, c=0, d=0

.endm



#define CFI_STARTPROC	ignore

#define CFI_ENDPROC	ignore

#define CFI_DEF_CFA	ignore

#define CFI_DEF_CFA_REGISTER	ignore

#define CFI_DEF_CFA_OFFSET	ignore

#define CFI_ADJUST_CFA_OFFSET	ignore

#define CFI_OFFSET	ignore

#define CFI_REL_OFFSET	ignore

#define CFI_REGISTER	ignore

#define CFI_RESTORE	ignore

#define CFI_REMEMBER_STATE	ignore

#define CFI_RESTORE_STATE	ignore

#define CFI_UNDEFINED	ignore

#define CFI_SIGNAL_FRAME	ignore



#endif



#endif