projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb/remote-fileio.c: Eliminate custom SIGINT signal handler
[deliverable/binutils-gdb.git]
/
bfd
/
elf32-moxie.c
diff --git
a/bfd/elf32-moxie.c
b/bfd/elf32-moxie.c
index 8463599775c060829d249881ab50c99313d8cddb..10a7a22ad040ce86392328b1b4038314f055cf54 100644
(file)
--- a/
bfd/elf32-moxie.c
+++ b/
bfd/elf32-moxie.c
@@
-1,9
+1,8
@@
/* moxie-specific support for 32-bit ELF.
/* moxie-specific support for 32-bit ELF.
- Copyright
2009, 2010
Free Software Foundation, Inc.
+ Copyright
(C) 2009-2016
Free Software Foundation, Inc.
Copied from elf32-fr30.c which is..
Copied from elf32-fr30.c which is..
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1998-2016 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
This file is part of BFD, the Binary File Descriptor library.
@@
-35,11
+34,11
@@
static reloc_howto_type moxie_elf_howto_table [] =
/* This reloc does nothing. */
HOWTO (R_MOXIE_NONE, /* type */
0, /* rightshift */
/* This reloc does nothing. */
HOWTO (R_MOXIE_NONE, /* type */
0, /* rightshift */
-
2
, /* size (0 = byte, 1 = short, 2 = long) */
-
32,
/* bitsize */
+
3
, /* size (0 = byte, 1 = short, 2 = long) */
+
0,
/* bitsize */
FALSE, /* pc_relative */
0, /* bitpos */
FALSE, /* pc_relative */
0, /* bitpos */
- complain_overflow_
bitfield
, /* complain_on_overflow */
+ complain_overflow_
dont
, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
"R_MOXIE_NONE", /* name */
FALSE, /* partial_inplace */
bfd_elf_generic_reloc, /* special_function */
"R_MOXIE_NONE", /* name */
FALSE, /* partial_inplace */
@@
-100,7
+99,7
@@
moxie_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
unsigned int i;
for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]);
unsigned int i;
for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]);
-
--i
;)
+
i--
;)
if (moxie_reloc_map [i].bfd_reloc_val == code)
return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val];
if (moxie_reloc_map [i].bfd_reloc_val == code)
return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val];
@@
-132,7
+131,11
@@
moxie_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
unsigned int r_type;
r_type = ELF32_R_TYPE (dst->r_info);
unsigned int r_type;
r_type = ELF32_R_TYPE (dst->r_info);
- BFD_ASSERT (r_type < (unsigned int) R_MOXIE_max);
+ if (r_type >= (unsigned int) R_MOXIE_max)
+ {
+ _bfd_error_handler (_("%B: invalid Moxie reloc number: %d"), abfd, r_type);
+ r_type = 0;
+ }
cache_ptr->howto = & moxie_elf_howto_table [r_type];
}
\f
cache_ptr->howto = & moxie_elf_howto_table [r_type];
}
\f
@@
-240,21
+243,21
@@
moxie_elf_relocate_section (bfd *output_bfd,
}
else
{
}
else
{
- bfd_boolean unresolved_reloc, warned;
+ bfd_boolean unresolved_reloc, warned
, ignored
;
RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
r_symndx, symtab_hdr, sym_hashes,
h, sec, relocation,
RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
r_symndx, symtab_hdr, sym_hashes,
h, sec, relocation,
- unresolved_reloc, warned);
+ unresolved_reloc, warned
, ignored
);
name = h->root.root.string;
}
name = h->root.root.string;
}
- if (sec != NULL &&
elf_
discarded_section (sec))
+ if (sec != NULL && discarded_section (sec))
RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
- rel,
relend, howto
, contents);
+ rel,
1, relend, howto, 0
, contents);
- if (
info->relocatable
)
+ if (
bfd_link_relocatable (info)
)
continue;
r = moxie_final_link_relocate (howto, input_bfd, input_section,
continue;
r = moxie_final_link_relocate (howto, input_bfd, input_section,
@@
-267,15
+270,14
@@
moxie_elf_relocate_section (bfd *output_bfd,
switch (r)
{
case bfd_reloc_overflow:
switch (r)
{
case bfd_reloc_overflow:
- r = info->callbacks->reloc_overflow
+ (*info->callbacks->reloc_overflow)
(info, (h ? &h->root : NULL), name, howto->name,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
break;
case bfd_reloc_undefined:
(info, (h ? &h->root : NULL), name, howto->name,
(bfd_vma) 0, input_bfd, input_section, rel->r_offset);
break;
case bfd_reloc_undefined:
- r = info->callbacks->undefined_symbol
- (info, name, input_bfd, input_section, rel->r_offset,
- TRUE);
+ (*info->callbacks->undefined_symbol)
+ (info, name, input_bfd, input_section, rel->r_offset, TRUE);
break;
case bfd_reloc_outofrange:
break;
case bfd_reloc_outofrange:
@@
-296,11
+298,8
@@
moxie_elf_relocate_section (bfd *output_bfd,
}
if (msg)
}
if (msg)
- r = info->callbacks->warning
- (info, msg, name, input_bfd, input_section, rel->r_offset);
-
- if (! r)
- return FALSE;
+ (*info->callbacks->warning) (info, msg, name, input_bfd,
+ input_section, rel->r_offset);
}
}
}
}
@@
-335,7
+334,7
@@
moxie_elf_check_relocs (bfd *abfd,
const Elf_Internal_Rela *rel;
const Elf_Internal_Rela *rel_end;
const Elf_Internal_Rela *rel;
const Elf_Internal_Rela *rel_end;
- if (
info->relocatable
)
+ if (
bfd_link_relocatable (info)
)
return TRUE;
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
return TRUE;
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
@@
-356,6
+355,10
@@
moxie_elf_check_relocs (bfd *abfd,
while (h->root.type == bfd_link_hash_indirect
|| h->root.type == bfd_link_hash_warning)
h = (struct elf_link_hash_entry *) h->root.u.i.link;
while (h->root.type == bfd_link_hash_indirect
|| h->root.type == bfd_link_hash_warning)
h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+ /* PR15323, ref flags aren't set for references in the same
+ object. */
+ h->root.non_ir_ref = 1;
}
}
}
}
@@
-364,10
+367,13
@@
moxie_elf_check_relocs (bfd *abfd,
\f
#define ELF_ARCH bfd_arch_moxie
#define ELF_MACHINE_CODE EM_MOXIE
\f
#define ELF_ARCH bfd_arch_moxie
#define ELF_MACHINE_CODE EM_MOXIE
+#define ELF_MACHINE_ALT1 EM_MOXIE_OLD
#define ELF_MAXPAGESIZE 0x1
#define ELF_MAXPAGESIZE 0x1
-#define TARGET_BIG_SYM bfd_elf32_moxie_vec
-#define TARGET_BIG_NAME "elf32-moxie"
+#define TARGET_BIG_SYM moxie_elf32_be_vec
+#define TARGET_BIG_NAME "elf32-bigmoxie"
+#define TARGET_LITTLE_SYM moxie_elf32_le_vec
+#define TARGET_LITTLE_NAME "elf32-littlemoxie"
#define elf_info_to_howto_rel NULL
#define elf_info_to_howto moxie_info_to_howto_rela
#define elf_info_to_howto_rel NULL
#define elf_info_to_howto moxie_info_to_howto_rela
This page took
0.026077 seconds
and
4
git commands to generate.