From 5369db0a6f2a8a0bec995672144ba15b5661dd72 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 4 Aug 2010 08:20:57 +0000 Subject: [PATCH] 2010-08-04 Tristan Gingold * vms-alpha.c (alpha_vms_add_lw_fixup): Renamed to ... (alpha_vms_add_fixup_lr): ... this for consistency. (alpha_vms_add_qw_fixup): Removed. Fix some comments. (vms_get_symbol_info): Adjust type for unknown sections. --- bfd/ChangeLog | 8 ++++++++ bfd/vms-alpha.c | 22 ++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7b02d7d6d7..c7a1c3f1bc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2010-08-04 Tristan Gingold + + * vms-alpha.c (alpha_vms_add_lw_fixup): Renamed to ... + (alpha_vms_add_fixup_lr): ... this for consistency. + (alpha_vms_add_qw_fixup): Removed. + Fix some comments. + (vms_get_symbol_info): Adjust type for unknown sections. + 2010-08-04 Tristan Gingold * vms-alpha.c (_bfd_vms_slurp_egsd): Use the canonical absolute diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index a7a166b3c6..916c279fac 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -376,10 +376,10 @@ static void alpha_vms_add_fixup_lp (struct bfd_link_info *, bfd *, bfd *); static void alpha_vms_add_fixup_ca (struct bfd_link_info *, bfd *, bfd *); static void alpha_vms_add_fixup_qr (struct bfd_link_info *, bfd *, bfd *, bfd_vma); +static void alpha_vms_add_fixup_lr (struct bfd_link_info *, unsigned int, + bfd_vma); static void alpha_vms_add_lw_reloc (struct bfd_link_info *info); static void alpha_vms_add_qw_reloc (struct bfd_link_info *info); -static void alpha_vms_add_lw_fixup (struct bfd_link_info *, unsigned int, - bfd_vma); struct vector_type { @@ -1799,7 +1799,7 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info) } else if (rel1 & RELC_SHR_BASE) { - alpha_vms_add_lw_fixup (info, rel1 & RELC_MASK, op1); + alpha_vms_add_fixup_lr (info, rel1 & RELC_MASK, op1); rel1 = RELC_NONE; } if (rel1 != RELC_NONE) @@ -8051,22 +8051,14 @@ alpha_vms_add_fixup_qr (struct bfd_link_info *info, bfd *src, } static void -alpha_vms_add_lw_fixup (struct bfd_link_info *info ATTRIBUTE_UNUSED, +alpha_vms_add_fixup_lr (struct bfd_link_info *info ATTRIBUTE_UNUSED, unsigned int shr ATTRIBUTE_UNUSED, bfd_vma vec ATTRIBUTE_UNUSED) { abort (); } -#if 0 -static void -alpha_vms_add_qw_fixup (struct bfd_link_info *info ATTRIBUTE_UNUSED, - unsigned int shr ATTRIBUTE_UNUSED, - bfd_vma vec ATTRIBUTE_UNUSED) -{ - abort (); -} -#endif +/* Add relocation. FIXME: Not yet emitted. */ static void alpha_vms_add_lw_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED) @@ -8529,8 +8521,6 @@ alpha_vms_build_fixups (struct bfd_link_info *info) bfd_putl32 (0, content + off + 4); off += 8; } - - /* CA fixups. */ } return TRUE; @@ -9115,7 +9105,7 @@ vms_get_symbol_info (bfd * abfd ATTRIBUTE_UNUSED, else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) ret->type = 'B'; else - ret->type = '-'; + ret->type = '?'; if (ret->type != 'U') ret->value = symbol->value + symbol->section->vma; -- 2.34.1