projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update copyright dates
[external/binutils.git]
/
bfd
/
i386linux.c
diff --git
a/bfd/i386linux.c
b/bfd/i386linux.c
index
5df2a11
..
dee733d
100644
(file)
--- a/
bfd/i386linux.c
+++ b/
bfd/i386linux.c
@@
-1,34
+1,34
@@
/* BFD back-end for linux flavored i386 a.out binaries.
/* BFD back-end for linux flavored i386 a.out binaries.
- Copyright
(C) 1992, 93, 94, 95, 96, 97, 98, 1999
- Free Software Foundation, Inc.
+ Copyright
1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
+
2004, 2005, 2006, 2007, 2008
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.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-
the Free Software Foundation; either version 2
of the License, or
-(at your option) any later version.
+
This program is free software; you can redistribute it and/or modify
+
it under the terms of the GNU General Public License as published by
+
the Free Software Foundation; either version 3
of the License, or
+
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+
This program is distributed in the hope that it will be useful,
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+
GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
#define TARGET_PAGE_SIZE 4096
#define ZMAGIC_DISK_BLOCK_SIZE 1024
#define SEGMENT_SIZE TARGET_PAGE_SIZE
#define TEXT_START_ADDR 0x0
#define N_SHARED_LIB(x) 0
#define TARGET_PAGE_SIZE 4096
#define ZMAGIC_DISK_BLOCK_SIZE 1024
#define SEGMENT_SIZE TARGET_PAGE_SIZE
#define TEXT_START_ADDR 0x0
#define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
-#include "bfd.h"
#include "sysdep.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "aout/aout64.h"
#include "aout/stab_gnu.h"
#include "libbfd.h"
#include "aout/aout64.h"
#include "aout/stab_gnu.h"
@@
-36,7
+36,11
@@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "libaout.h" /* BFD a.out internal data structures */
#define DEFAULT_ARCH bfd_arch_i386
#include "libaout.h" /* BFD a.out internal data structures */
#define DEFAULT_ARCH bfd_arch_i386
-#define MY(OP) CAT(i386linux_,OP)
+
+/* Do not "beautify" the CONCAT* macro args. Traditional C will not
+ remove whitespace added here, and thus will fail to concatenate
+ the tokens. */
+#define MY(OP) CONCAT2 (i386linux_,OP)
#define TARGETNAME "a.out-i386-linux"
extern const bfd_target MY(vec);
#define TARGETNAME "a.out-i386-linux"
extern const bfd_target MY(vec);
@@
-47,11
+51,11
@@
extern const bfd_target MY(vec);
static void MY_final_link_callback
PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
static void MY_final_link_callback
PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-static boolean i386linux_bfd_final_link
+static b
fd_b
oolean i386linux_bfd_final_link
PARAMS ((bfd *, struct bfd_link_info *));
PARAMS ((bfd *, struct bfd_link_info *));
-static boolean i386linux_write_object_contents PARAMS ((bfd *));
+static b
fd_b
oolean i386linux_write_object_contents PARAMS ((bfd *));
-static boolean
+static b
fd_b
oolean
i386linux_bfd_final_link (abfd, info)
bfd *abfd;
struct bfd_link_info *info;
i386linux_bfd_final_link (abfd, info)
bfd *abfd;
struct bfd_link_info *info;
@@
-64,7
+68,7
@@
i386linux_bfd_final_link (abfd, info)
/* Set the machine type correctly. */
/* Set the machine type correctly. */
-static boolean
+static b
fd_b
oolean
i386linux_write_object_contents (abfd)
bfd *abfd;
{
i386linux_write_object_contents (abfd)
bfd *abfd;
{
@@
-77,7
+81,7
@@
i386linux_write_object_contents (abfd)
WRITE_HEADERS(abfd, execp);
WRITE_HEADERS(abfd, execp);
- return
true
;
+ return
TRUE
;
}
#define MY_write_object_contents i386linux_write_object_contents
}
#define MY_write_object_contents i386linux_write_object_contents
@@
-90,8
+94,7
@@
i386linux_write_object_contents (abfd)
#define GOT_REF_PREFIX "__GOT_"
#endif
#define GOT_REF_PREFIX "__GOT_"
#endif
-#define IS_GOT_SYM(name) \
- (strncmp (name, GOT_REF_PREFIX, sizeof GOT_REF_PREFIX - 1) == 0)
+#define IS_GOT_SYM(name) (CONST_STRNEQ (name, GOT_REF_PREFIX))
/* See if a symbol name is a reference to the procedure linkage table. */
/* See if a symbol name is a reference to the procedure linkage table. */
@@
-99,8
+102,7
@@
i386linux_write_object_contents (abfd)
#define PLT_REF_PREFIX "__PLT_"
#endif
#define PLT_REF_PREFIX "__PLT_"
#endif
-#define IS_PLT_SYM(name) \
- (strncmp (name, PLT_REF_PREFIX, sizeof PLT_REF_PREFIX - 1) == 0)
+#define IS_PLT_SYM(name) (CONST_STRNEQ (name, PLT_REF_PREFIX))
/* This string is used to generate specialized error messages. */
/* This string is used to generate specialized error messages. */
@@
-109,7
+111,7
@@
i386linux_write_object_contents (abfd)
#endif
/* This special symbol is a set vector that contains a list of
#endif
/* This special symbol is a set vector that contains a list of
- pointers to fixup tables. It will be present in any dynamicly
+ pointers to fixup tables. It will be present in any dynamic
al
ly
linked file. The linker generated fixup table should also be added
to the list, and it should always appear in the second slot (the
first one is a dummy with a magic number that is defined in
linked file. The linker generated fixup table should also be added
to the list, and it should always appear in the second slot (the
first one is a dummy with a magic number that is defined in
@@
-175,15
+177,15
@@
static struct bfd_link_hash_table *linux_link_hash_table_create
static struct fixup *new_fixup
PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
bfd_vma, int));
static struct fixup *new_fixup
PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
+static b
fd_b
oolean linux_link_create_dynamic_sections
PARAMS ((bfd *, struct bfd_link_info *));
PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
+static b
fd_b
oolean linux_add_one_symbol
PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
- bfd_vma, const char *, b
oolean,
boolean,
+ bfd_vma, const char *, b
fd_boolean, bfd_
boolean,
struct bfd_link_hash_entry **));
struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
+static b
fd_b
oolean linux_tally_symbols
PARAMS ((struct linux_link_hash_entry *, PTR));
PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
+static b
fd_b
oolean linux_finish_dynamic_link
PARAMS ((bfd *, struct bfd_link_info *));
/* Routine to create an entry in an Linux link hash table. */
PARAMS ((bfd *, struct bfd_link_info *));
/* Routine to create an entry in an Linux link hash table. */
@@
-223,13
+225,14
@@
linux_link_hash_table_create (abfd)
bfd *abfd;
{
struct linux_link_hash_table *ret;
bfd *abfd;
{
struct linux_link_hash_table *ret;
+ bfd_size_type amt = sizeof (struct linux_link_hash_table);
- ret = ((struct linux_link_hash_table *)
- bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
+ ret = (struct linux_link_hash_table *) bfd_alloc (abfd, amt);
if (ret == (struct linux_link_hash_table *) NULL)
return (struct bfd_link_hash_table *) NULL;
if (ret == (struct linux_link_hash_table *) NULL)
return (struct bfd_link_hash_table *) NULL;
- if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
- linux_link_hash_newfunc))
+ if (!NAME(aout,link_hash_table_init) (&ret->root, abfd,
+ linux_link_hash_newfunc,
+ sizeof (struct linux_link_hash_entry)))
{
free (ret);
return (struct bfd_link_hash_table *) NULL;
{
free (ret);
return (struct bfd_link_hash_table *) NULL;
@@
-255,7
+258,7
@@
linux_link_hash_table_create (abfd)
#define linux_link_hash_traverse(table, func, info) \
(aout_link_hash_traverse \
(&(table)->root, \
#define linux_link_hash_traverse(table, func, info) \
(aout_link_hash_traverse \
(&(table)->root, \
- (b
oolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),
\
+ (b
fd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),
\
(info)))
/* Get the Linux link hash table from the info structure. This is
(info)))
/* Get the Linux link hash table from the info structure. This is
@@
-295,7
+298,7
@@
new_fixup (info, h, value, builtin)
know the size of the section, but that's OK - we just need to
create it for now. */
know the size of the section, but that's OK - we just need to
create it for now. */
-static boolean
+static b
fd_b
oolean
linux_link_create_dynamic_sections (abfd, info)
bfd *abfd;
struct bfd_link_info *info ATTRIBUTE_UNUSED;
linux_link_create_dynamic_sections (abfd, info)
bfd *abfd;
struct bfd_link_info *info ATTRIBUTE_UNUSED;
@@
-308,22
+311,21
@@
linux_link_create_dynamic_sections (abfd, info)
/* We choose to use the name ".linux-dynamic" for the fixup table.
Why not? */
/* We choose to use the name ".linux-dynamic" for the fixup table.
Why not? */
- s = bfd_make_section
(abfd, ".linux-dynamic"
);
+ s = bfd_make_section
_with_flags (abfd, ".linux-dynamic", flags
);
if (s == NULL
if (s == NULL
- || ! bfd_set_section_flags (abfd, s, flags)
|| ! bfd_set_section_alignment (abfd, s, 2))
|| ! bfd_set_section_alignment (abfd, s, 2))
- return
false
;
- s->
_raw_
size = 0;
+ return
FALSE
;
+ s->size = 0;
s->contents = 0;
s->contents = 0;
- return
true
;
+ return
TRUE
;
}
/* Function to add a single symbol to the linker hash table. This is
a wrapper around _bfd_generic_link_add_one_symbol which handles the
tweaking needed for dynamic linking support. */
}
/* Function to add a single symbol to the linker hash table. This is
a wrapper around _bfd_generic_link_add_one_symbol which handles the
tweaking needed for dynamic linking support. */
-static boolean
+static b
fd_b
oolean
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
copy, collect, hashp)
struct bfd_link_info *info;
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
copy, collect, hashp)
struct bfd_link_info *info;
@@
-333,40
+335,40
@@
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
asection *section;
bfd_vma value;
const char *string;
asection *section;
bfd_vma value;
const char *string;
- boolean copy;
- boolean collect;
+ b
fd_b
oolean copy;
+ b
fd_b
oolean collect;
struct bfd_link_hash_entry **hashp;
{
struct linux_link_hash_entry *h;
struct bfd_link_hash_entry **hashp;
{
struct linux_link_hash_entry *h;
- boolean insert;
+ b
fd_b
oolean insert;
/* Look up and see if we already have this symbol in the hash table.
If we do, and the defining entry is from a shared library, we
need to create the dynamic sections.
/* Look up and see if we already have this symbol in the hash table.
If we do, and the defining entry is from a shared library, we
need to create the dynamic sections.
- FIXME: What if abfd->xvec != info->
hash->creator? We may want to
- be able to link Linux a.out and ELF objects together, but serious
- confusion is possible. */
+ FIXME: What if abfd->xvec != info->
output_bfd->xvec? We may
+ want to be able to link Linux a.out and ELF objects together,
+
but serious
confusion is possible. */
- insert =
false
;
+ insert =
FALSE
;
- if (! info->relocat
e
able
+ if (! info->relocatable
&& linux_hash_table (info)->dynobj == NULL
&& strcmp (name, SHARABLE_CONFLICTS) == 0
&& (flags & BSF_CONSTRUCTOR) != 0
&& linux_hash_table (info)->dynobj == NULL
&& strcmp (name, SHARABLE_CONFLICTS) == 0
&& (flags & BSF_CONSTRUCTOR) != 0
- && abfd->xvec == info->
hash->creator
)
+ && abfd->xvec == info->
output_bfd->xvec
)
{
if (! linux_link_create_dynamic_sections (abfd, info))
{
if (! linux_link_create_dynamic_sections (abfd, info))
- return
false
;
+ return
FALSE
;
linux_hash_table (info)->dynobj = abfd;
linux_hash_table (info)->dynobj = abfd;
- insert =
true
;
+ insert =
TRUE
;
}
if (bfd_is_abs_section (section)
}
if (bfd_is_abs_section (section)
- && abfd->xvec == info->
hash->creator
)
+ && abfd->xvec == info->
output_bfd->xvec
)
{
{
- h = linux_link_hash_lookup (linux_hash_table (info), name,
false
,
-
false, false
);
+ h = linux_link_hash_lookup (linux_hash_table (info), name,
FALSE
,
+
FALSE, FALSE
);
if (h != NULL
&& (h->root.root.type == bfd_link_hash_defined
|| h->root.root.type == bfd_link_hash_defweak))
if (h != NULL
&& (h->root.root.type == bfd_link_hash_defined
|| h->root.root.type == bfd_link_hash_defweak))
@@
-378,10
+380,10
@@
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
if (f == NULL)
f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
if (f == NULL)
- return
false
;
+ return
FALSE
;
f->jump = IS_PLT_SYM (name);
f->jump = IS_PLT_SYM (name);
- return
true
;
+ return
TRUE
;
}
}
}
}
@@
-389,7
+391,7
@@
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
value, string, copy, collect,
hashp))
if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
value, string, copy, collect,
hashp))
- return
false
;
+ return
FALSE
;
/* Insert a pointer to our table in the set vector. The dynamic
linker requires this information */
/* Insert a pointer to our table in the set vector. The dynamic
linker requires this information */
@@
-405,11
+407,12
@@
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
if (! (_bfd_generic_link_add_one_symbol
(info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
if (! (_bfd_generic_link_add_one_symbol
(info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
- BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL)))
- return false;
+ BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+ FALSE, FALSE, NULL)))
+ return FALSE;
}
}
- return
true
;
+ return
TRUE
;
}
/* We will crawl the hash table and come here for every global symbol.
}
/* We will crawl the hash table and come here for every global symbol.
@@
-422,7
+425,7
@@
linux_add_one_symbol (info, abfd, name, flags, section, value, string,
This function is called via linux_link_hash_traverse. */
This function is called via linux_link_hash_traverse. */
-static boolean
+static b
fd_b
oolean
linux_tally_symbols (h, data)
struct linux_link_hash_entry *h;
PTR data;
linux_tally_symbols (h, data)
struct linux_link_hash_entry *h;
PTR data;
@@
-431,11
+434,13
@@
linux_tally_symbols (h, data)
struct fixup *f, *f1;
int is_plt;
struct linux_link_hash_entry *h1, *h2;
struct fixup *f, *f1;
int is_plt;
struct linux_link_hash_entry *h1, *h2;
- boolean exists;
+ bfd_boolean exists;
+
+ if (h->root.root.type == bfd_link_hash_warning)
+ h = (struct linux_link_hash_entry *) h->root.root.u.i.link;
if (h->root.root.type == bfd_link_hash_undefined
if (h->root.root.type == bfd_link_hash_undefined
- && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
- sizeof NEEDS_SHRLIB - 1) == 0)
+ && CONST_STRNEQ (h->root.root.root.string, NEEDS_SHRLIB))
{
const char *name;
char *p;
{
const char *name;
char *p;
@@
-444,7
+449,7
@@
linux_tally_symbols (h, data)
name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
p = strrchr (name, '_');
if (p != NULL)
name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
p = strrchr (name, '_');
if (p != NULL)
- alloc = (char *) bfd_malloc (strlen (name) + 1);
+ alloc = (char *) bfd_malloc (
(bfd_size_type)
strlen (name) + 1);
if (p == NULL || alloc == NULL)
(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
if (p == NULL || alloc == NULL)
(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
@@
-474,12
+479,12
@@
linux_tally_symbols (h, data)
h1 = linux_link_hash_lookup (linux_hash_table (info),
(h->root.root.root.string
+ sizeof PLT_REF_PREFIX - 1),
h1 = linux_link_hash_lookup (linux_hash_table (info),
(h->root.root.root.string
+ sizeof PLT_REF_PREFIX - 1),
-
false, false, true
);
+
FALSE, FALSE, TRUE
);
/* h2 does not follow indirect symbols. */
/* h2 does not follow indirect symbols. */
- h2 = linux_link_hash_lookup (linux_hash_table (info),
+ h2 = linux_link_hash_lookup (linux_hash_table (info),
(h->root.root.root.string
+ sizeof PLT_REF_PREFIX - 1),
(h->root.root.root.string
+ sizeof PLT_REF_PREFIX - 1),
-
false, false, false
);
+
FALSE, FALSE, FALSE
);
/* The real symbol must exist but if it is also an ABS symbol,
there is no need to have a fixup. This is because they both
/* The real symbol must exist but if it is also an ABS symbol,
there is no need to have a fixup. This is because they both
@@
-497,7
+502,7
@@
linux_tally_symbols (h, data)
involving this symbol. If so, convert it to a regular
fixup. In the end, this relaxes some of the requirements
about the order of performing fixups. */
involving this symbol. If so, convert it to a regular
fixup. In the end, this relaxes some of the requirements
about the order of performing fixups. */
- exists =
false
;
+ exists =
FALSE
;
for (f1 = linux_hash_table (info)->fixup_list;
f1 != NULL;
f1 = f1->next)
for (f1 = linux_hash_table (info)->fixup_list;
f1 != NULL;
f1 = f1->next)
@@
-506,7
+511,7
@@
linux_tally_symbols (h, data)
|| (! f1->builtin && ! f1->jump))
continue;
if (f1->h == h1)
|| (! f1->builtin && ! f1->jump))
continue;
if (f1->h == h1)
- exists =
true
;
+ exists =
TRUE
;
if (! exists
&& bfd_is_abs_section (h->root.root.u.def.section))
{
if (! exists
&& bfd_is_abs_section (h->root.root.u.def.section))
{
@@
-516,7
+521,7
@@
linux_tally_symbols (h, data)
f1->h = h1;
f1->jump = is_plt;
f1->builtin = 0;
f1->h = h1;
f1->jump = is_plt;
f1->builtin = 0;
- exists =
true
;
+ exists =
TRUE
;
}
if (! exists
&& bfd_is_abs_section (h->root.root.u.def.section))
}
if (! exists
&& bfd_is_abs_section (h->root.root.u.def.section))
@@
-534,10
+539,10
@@
linux_tally_symbols (h, data)
/* Quick and dirty way of stripping these symbols from the
symtab. */
if (bfd_is_abs_section (h->root.root.u.def.section))
/* Quick and dirty way of stripping these symbols from the
symtab. */
if (bfd_is_abs_section (h->root.root.u.def.section))
- h->root.written =
true
;
+ h->root.written =
TRUE
;
}
}
- return
true
;
+ return
TRUE
;
}
/* This is called to set the size of the .linux-dynamic section is.
}
/* This is called to set the size of the .linux-dynamic section is.
@@
-546,7
+551,7
@@
linux_tally_symbols (h, data)
we just scan the hash tables to find out how many additional fixups
are required. */
we just scan the hash tables to find out how many additional fixups
are required. */
-boolean
+b
fd_b
oolean
bfd_i386linux_size_dynamic_sections (output_bfd, info)
bfd *output_bfd;
struct bfd_link_info *info;
bfd_i386linux_size_dynamic_sections (output_bfd, info)
bfd *output_bfd;
struct bfd_link_info *info;
@@
-555,7
+560,7
@@
bfd_i386linux_size_dynamic_sections (output_bfd, info)
asection *s;
if (output_bfd->xvec != &MY(vec))
asection *s;
if (output_bfd->xvec != &MY(vec))
- return
true
;
+ return
TRUE
;
/* First find the fixups... */
linux_link_hash_traverse (linux_hash_table (info),
/* First find the fixups... */
linux_link_hash_traverse (linux_hash_table (info),
@@
-579,7
+584,7
@@
bfd_i386linux_size_dynamic_sections (output_bfd, info)
{
if (linux_hash_table (info)->fixup_count > 0)
abort ();
{
if (linux_hash_table (info)->fixup_count > 0)
abort ();
- return
true
;
+ return
TRUE
;
}
/* Allocate memory for our fixup table. We will fill it in later. */
}
/* Allocate memory for our fixup table. We will fill it in later. */
@@
-587,21
+592,21
@@
bfd_i386linux_size_dynamic_sections (output_bfd, info)
".linux-dynamic");
if (s != NULL)
{
".linux-dynamic");
if (s != NULL)
{
- s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
- s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
+ s->size = linux_hash_table (info)->fixup_count + 1;
+ s->size *= 8;
+ s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->size);
if (s->contents == NULL)
if (s->contents == NULL)
- return false;
- memset (s->contents, 0, (size_t) s->_raw_size);
+ return FALSE;
}
}
- return
true
;
+ return
TRUE
;
}
/* We come here once we are ready to actually write the fixup table to
the output file. Scan the fixup tables and so forth and generate
the stuff we need. */
}
/* We come here once we are ready to actually write the fixup table to
the output file. Scan the fixup tables and so forth and generate
the stuff we need. */
-static boolean
+static b
fd_b
oolean
linux_finish_dynamic_link (output_bfd, info)
bfd *output_bfd;
struct bfd_link_info *info;
linux_finish_dynamic_link (output_bfd, info)
bfd *output_bfd;
struct bfd_link_info *info;
@@
-615,7
+620,7
@@
linux_finish_dynamic_link (output_bfd, info)
unsigned int fixups_written;
if (linux_hash_table (info)->dynobj == NULL)
unsigned int fixups_written;
if (linux_hash_table (info)->dynobj == NULL)
- return
true
;
+ return
TRUE
;
s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
".linux-dynamic");
s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
".linux-dynamic");
@@
-624,13
+629,14
@@
linux_finish_dynamic_link (output_bfd, info)
fixups_written = 0;
#ifdef LINUX_LINK_DEBUG
fixups_written = 0;
#ifdef LINUX_LINK_DEBUG
- printf ("Fixup table file offset: %x VMA: %x\n",
+ printf ("Fixup table file offset: %x VMA: %x\n",
os->filepos + s->output_offset,
os->vma + s->output_offset);
#endif
fixup_table = s->contents;
os->filepos + s->output_offset,
os->vma + s->output_offset);
#endif
fixup_table = s->contents;
- bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table);
+ bfd_put_32 (output_bfd,
+ (bfd_vma) linux_hash_table (info)->fixup_count, fixup_table);
fixup_table += 4;
/* Fill in fixup table. */
fixup_table += 4;
/* Fill in fixup table. */
@@
-660,15
+666,15
@@
linux_finish_dynamic_link (output_bfd, info)
if (f->jump)
{
/* Relative address */
if (f->jump)
{
/* Relative address */
- new_addr = new_addr - (f->value + 5);
- bfd_put_32 (output_bfd, new_addr, fixup_table);
+ new_addr = new_addr - (f->value + 5);
+ bfd_put_32 (output_bfd,
(bfd_vma)
new_addr, fixup_table);
fixup_table += 4;
bfd_put_32 (output_bfd, f->value + 1, fixup_table);
fixup_table += 4;
}
else
{
fixup_table += 4;
bfd_put_32 (output_bfd, f->value + 1, fixup_table);
fixup_table += 4;
}
else
{
- bfd_put_32 (output_bfd, new_addr, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
new_addr, fixup_table);
fixup_table += 4;
bfd_put_32 (output_bfd, f->value, fixup_table);
fixup_table += 4;
fixup_table += 4;
bfd_put_32 (output_bfd, f->value, fixup_table);
fixup_table += 4;
@@
-679,9
+685,9
@@
linux_finish_dynamic_link (output_bfd, info)
if (linux_hash_table (info)->local_builtins != 0)
{
/* Special marker so we know to switch to the other type of fixup */
if (linux_hash_table (info)->local_builtins != 0)
{
/* Special marker so we know to switch to the other type of fixup */
- bfd_put_32 (output_bfd, 0, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
0, fixup_table);
fixup_table += 4;
fixup_table += 4;
- bfd_put_32 (output_bfd, 0, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
0, fixup_table);
fixup_table += 4;
++fixups_written;
for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
fixup_table += 4;
++fixups_written;
for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
@@
-707,7
+713,7
@@
linux_finish_dynamic_link (output_bfd, info)
new_addr, f->value);
#endif
new_addr, f->value);
#endif
- bfd_put_32 (output_bfd, new_addr, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
new_addr, fixup_table);
fixup_table += 4;
bfd_put_32 (output_bfd, f->value, fixup_table);
fixup_table += 4;
fixup_table += 4;
bfd_put_32 (output_bfd, f->value, fixup_table);
fixup_table += 4;
@@
-720,17
+726,17
@@
linux_finish_dynamic_link (output_bfd, info)
(*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
(*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
- bfd_put_32 (output_bfd, 0, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
0, fixup_table);
fixup_table += 4;
fixup_table += 4;
- bfd_put_32 (output_bfd, 0, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
0, fixup_table);
fixup_table += 4;
++fixups_written;
}
}
fixup_table += 4;
++fixups_written;
}
}
- h = linux_link_hash_lookup (linux_hash_table (info),
+ h = linux_link_hash_lookup (linux_hash_table (info),
"__BUILTIN_FIXUPS__",
"__BUILTIN_FIXUPS__",
-
false, false, false
);
+
FALSE, FALSE, FALSE
);
if (h != NULL
&& (h->root.root.type == bfd_link_hash_defined
if (h != NULL
&& (h->root.root.type == bfd_link_hash_defined
@@
-744,19
+750,19
@@
linux_finish_dynamic_link (output_bfd, info)
printf ("Builtin fixup table at %x\n", new_addr);
#endif
printf ("Builtin fixup table at %x\n", new_addr);
#endif
- bfd_put_32 (output_bfd, new_addr, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
new_addr, fixup_table);
}
else
}
else
- bfd_put_32 (output_bfd, 0, fixup_table);
+ bfd_put_32 (output_bfd,
(bfd_vma)
0, fixup_table);
- if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0)
- return false;
+ if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
+ SEEK_SET) != 0)
+ return FALSE;
- if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd)
- != s->_raw_size)
- return false;
+ if (bfd_bwrite ((PTR) s->contents, s->size, output_bfd) != s->size)
+ return FALSE;
- return
true
;
+ return
TRUE
;
}
#define MY_bfd_link_hash_table_create linux_link_hash_table_create
}
#define MY_bfd_link_hash_table_create linux_link_hash_table_create