OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* dw2gencfi.c (CFI_DIFF_EXPR_OK): Define if not defined. 

(dot_cfi_personality): Use CFI_DIFF_EXPR_OK instead of DIFF_EXPR_OK.
	(dot_cfi_lsda, output_cie, output_fde): Likewise.
	* config/tc-hppa.h (CFI_DIFF_EXPR_OK): Define.
This commit is contained in:
Dave Anglin 2008-09-07 22:54:54 +00:00
parent 66c103b772
commit 3dd243066b
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gas/ChangeLog
View File

@ -1,3 +1,10 @@
2008-09-07 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* dw2gencfi.c (CFI_DIFF_EXPR_OK): Define if not defined.
(dot_cfi_personality): Use CFI_DIFF_EXPR_OK instead of DIFF_EXPR_OK.
(dot_cfi_lsda, output_cie, output_fde): Likewise.
* config/tc-hppa.h (CFI_DIFF_EXPR_OK): Define.
2008-09-06 Richard Sandiford <rdsandiford@googlemail.com>
* config/tc-mips.h (DWARF2_FDE_RELOC_SIZE): Define.

4
gas/config/tc-hppa.h
View File

@ -222,6 +222,10 @@ extern int hppa_regname_to_dw2regnum (char *regname);
/* Due to the way dynamic linking to personality functions is handled
on HP-UX, we need to have a read-write .eh_frame section. */
#define DWARF2_EH_FRAME_READ_ONLY 0
/* Because differences between text and data symbols don't work, we
can't use difference expressions during CFI generation. */
#define CFI_DIFF_EXPR_OK 0
#endif
#endif /* OBJ_ELF */

21
gas/dw2gencfi.c
View File

@ -25,6 +25,15 @@
#ifdef TARGET_USE_CFIPOP
/* By default, use difference expressions if DIFF_EXPR_OK is defined. */
#ifndef CFI_DIFF_EXPR_OK
# ifdef DIFF_EXPR_OK
# define CFI_DIFF_EXPR_OK 1
# else
# define CFI_DIFF_EXPR_OK 0
# endif
#endif
/* We re-use DWARF2_LINE_MIN_INSN_LENGTH for the code alignment field
of the CIE. Default to 1 if not otherwise specified. */
#ifndef DWARF2_LINE_MIN_INSN_LENGTH
@ -655,7 +664,7 @@ dot_cfi_personality (int ignored ATTRIBUTE_UNUSED)
if ((encoding & 0xff) != encoding
|| ((encoding & 0x70) != 0
#if defined DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
#if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
&& (encoding & 0x70) != DW_EH_PE_pcrel
#endif
)
@ -725,7 +734,7 @@ dot_cfi_lsda (int ignored ATTRIBUTE_UNUSED)
if ((encoding & 0xff) != encoding
|| ((encoding & 0x70) != 0
#if defined DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
#if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
&& (encoding & 0x70) != DW_EH_PE_pcrel
#endif
)
@ -1092,7 +1101,7 @@ output_cie (struct cie_entry *cie)
exp = cie->personality;
if ((cie->per_encoding & 0x70) == DW_EH_PE_pcrel)
{
#ifdef DIFF_EXPR_OK
#if CFI_DIFF_EXPR_OK
exp.X_op = O_subtract;
exp.X_op_symbol = symbol_temp_new_now ();
emit_expr (&exp, size);
@ -1122,7 +1131,7 @@ output_cie (struct cie_entry *cie)
default:
abort ();
}
#if defined DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
#if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
enc |= DW_EH_PE_pcrel;
#endif
out_one (enc);
@ -1157,7 +1166,7 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
exp.X_op_symbol = cie->start_address;
emit_expr (&exp, 4); /* CIE offset. */
#ifdef DIFF_EXPR_OK
#if CFI_DIFF_EXPR_OK
exp.X_add_symbol = fde->start_address;
exp.X_op_symbol = symbol_temp_new_now ();
emit_expr (&exp, DWARF2_FDE_RELOC_SIZE); /* Code offset. */
@ -1185,7 +1194,7 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
exp = fde->lsda;
if ((fde->lsda_encoding & 0x70) == DW_EH_PE_pcrel)
{
#ifdef DIFF_EXPR_OK
#if CFI_DIFF_EXPR_OK
exp.X_op = O_subtract;
exp.X_op_symbol = symbol_temp_new_now ();
emit_expr (&exp, augmentation_size);