diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/dwarf2asm.c | 8 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 767e880..4cd36c7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-02-12 Jakub Jelinek <jakub@redhat.com> + + * dwarf2asm.c (dw2_asm_output_vms_delta): Only define + if ASM_OUTPUT_DWARF_VMS_DELTA is defined. + * dwarf2out.c (output_die): Use dw2_asm_output_vms_delta + only if ASM_OUTPUT_DWARF_VMS_DELTA is defined. + 2015-02-12 Jason Merrill <jason@redhat.com> * common.opt (-flifetime-dse): New. diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c index c5942b9..b817aaf 100644 --- a/gcc/dwarf2asm.c +++ b/gcc/dwarf2asm.c @@ -159,6 +159,7 @@ dw2_asm_output_delta (int size, const char *lab1, const char *lab2, va_end (ap); } +#ifdef ASM_OUTPUT_DWARF_VMS_DELTA /* Output the difference between two symbols in instruction units in a given size. */ @@ -171,11 +172,6 @@ dw2_asm_output_vms_delta (int size ATTRIBUTE_UNUSED, va_start (ap, comment); -#ifndef ASM_OUTPUT_DWARF_VMS_DELTA - /* VMS Delta is only special on ia64-vms, but this function also gets - called on alpha-vms so it has to do something sane. */ - dw2_asm_output_delta (size, lab1, lab2, comment); -#else ASM_OUTPUT_DWARF_VMS_DELTA (asm_out_file, size, lab1, lab2); if (flag_debug_asm && comment) { @@ -183,10 +179,10 @@ dw2_asm_output_vms_delta (int size ATTRIBUTE_UNUSED, vfprintf (asm_out_file, comment, ap); } fputc ('\n', asm_out_file); -#endif va_end (ap); } +#endif /* Output a section-relative reference to a LABEL, which was placed in BASE. In general this can only be done for debugging symbols. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 2ecd23f..71dc355 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -9002,9 +9002,15 @@ output_die (dw_die_ref die) break; case dw_val_class_vms_delta: +#ifdef ASM_OUTPUT_DWARF_VMS_DELTA dw2_asm_output_vms_delta (DWARF_OFFSET_SIZE, AT_vms_delta2 (a), AT_vms_delta1 (a), "%s", name); +#else + dw2_asm_output_delta (DWARF_OFFSET_SIZE, + AT_vms_delta2 (a), AT_vms_delta1 (a), + "%s", name); +#endif break; case dw_val_class_lbl_id: |