projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* NEWS: Document new options "set/show use-deprecated-index-sections",
[deliverable/binutils-gdb.git]
/
bfd
/
elf32-m32c.c
diff --git
a/bfd/elf32-m32c.c
b/bfd/elf32-m32c.c
index 6c4352d7e1e4c6c674b4ffa70c3c0fc95bf81c79..b2b12ca330ab21284c7f2b0e0c1093d91b1d7c5b 100644
(file)
--- a/
bfd/elf32-m32c.c
+++ b/
bfd/elf32-m32c.c
@@
-639,7
+639,8
@@
m32c_elf_check_relocs
flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
| SEC_IN_MEMORY | SEC_LINKER_CREATED
| SEC_READONLY | SEC_CODE);
flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
| SEC_IN_MEMORY | SEC_LINKER_CREATED
| SEC_READONLY | SEC_CODE);
- splt = bfd_make_section_with_flags (dynobj, ".plt", flags);
+ splt = bfd_make_section_anyway_with_flags (dynobj, ".plt",
+ flags);
if (splt == NULL
|| ! bfd_set_section_alignment (dynobj, splt, 1))
return FALSE;
if (splt == NULL
|| ! bfd_set_section_alignment (dynobj, splt, 1))
return FALSE;
@@
-829,7
+830,7
@@
m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
\f
static bfd_boolean
\f
static bfd_boolean
-m32c_elf_print_private_bfd_data (bfd *abfd,
PTR
ptr)
+m32c_elf_print_private_bfd_data (bfd *abfd,
void *
ptr)
{
FILE *file = (FILE *) ptr;
flagword flags;
{
FILE *file = (FILE *) ptr;
flagword flags;
@@
-984,8
+985,7
@@
struct relax_plt_data
};
static bfd_boolean
};
static bfd_boolean
-m32c_relax_plt_check (struct elf_link_hash_entry *h,
- PTR xdata)
+m32c_relax_plt_check (struct elf_link_hash_entry *h, void * xdata)
{
struct relax_plt_data *data = (struct relax_plt_data *) xdata;
{
struct relax_plt_data *data = (struct relax_plt_data *) xdata;
@@
-1016,8
+1016,7
@@
m32c_relax_plt_check (struct elf_link_hash_entry *h,
previously had a plt entry, give it a new entry offset. */
static bfd_boolean
previously had a plt entry, give it a new entry offset. */
static bfd_boolean
-m32c_relax_plt_realloc (struct elf_link_hash_entry *h,
- PTR xdata)
+m32c_relax_plt_realloc (struct elf_link_hash_entry *h, void * xdata)
{
bfd_vma *entry = (bfd_vma *) xdata;
{
bfd_vma *entry = (bfd_vma *) xdata;
@@
-1031,8
+1030,7
@@
m32c_relax_plt_realloc (struct elf_link_hash_entry *h,
}
static bfd_boolean
}
static bfd_boolean
-m32c_elf_relax_plt_section (bfd *dynobj,
- asection *splt,
+m32c_elf_relax_plt_section (asection *splt,
struct bfd_link_info *info,
bfd_boolean *again)
{
struct bfd_link_info *info,
bfd_boolean *again)
{
@@
-1045,11
+1043,6
@@
m32c_elf_relax_plt_section (bfd *dynobj,
if (info->relocatable)
return TRUE;
if (info->relocatable)
return TRUE;
- /* We only relax the .plt section at the moment. */
- if (dynobj != elf_hash_table (info)->dynobj
- || strcmp (splt->name, ".plt") != 0)
- return TRUE;
-
/* Quick check for an empty plt. */
if (splt->size == 0)
return TRUE;
/* Quick check for an empty plt. */
if (splt->size == 0)
return TRUE;
@@
-1337,8
+1330,9
@@
m32c_elf_relax_section
int machine;
if (abfd == elf_hash_table (link_info)->dynobj
int machine;
if (abfd == elf_hash_table (link_info)->dynobj
+ && (sec->flags & SEC_LINKER_CREATED) != 0
&& strcmp (sec->name, ".plt") == 0)
&& strcmp (sec->name, ".plt") == 0)
- return m32c_elf_relax_plt_section (
abfd,
sec, link_info, again);
+ return m32c_elf_relax_plt_section (sec, link_info, again);
/* Assume nothing changes. */
*again = FALSE;
/* Assume nothing changes. */
*again = FALSE;
@@
-1386,14
+1380,14
@@
m32c_elf_relax_section
if (shndx_buf == NULL)
goto error_return;
if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
if (shndx_buf == NULL)
goto error_return;
if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
- || bfd_bread (
(PTR)
shndx_buf, amt, abfd) != amt)
+ || bfd_bread (shndx_buf, amt, abfd) != amt)
goto error_return;
shndx_hdr->contents = (bfd_byte *) shndx_buf;
}
/* Get a copy of the native relocations. */
internal_relocs = (_bfd_elf_link_read_relocs
goto error_return;
shndx_hdr->contents = (bfd_byte *) shndx_buf;
}
/* Get a copy of the native relocations. */
internal_relocs = (_bfd_elf_link_read_relocs
- (abfd, sec,
(PTR)
NULL, (Elf_Internal_Rela *) NULL,
+ (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
link_info->keep_memory));
if (internal_relocs == NULL)
goto error_return;
link_info->keep_memory));
if (internal_relocs == NULL)
goto error_return;
This page took
0.023975 seconds
and
4
git commands to generate.