darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Formatting fixes.

Browse source 
* ldbuildid.c: Formatting.
	* ldcref.c: Formatting.
	* ldctor.c: Formatting.
	* ldemul.c: Formatting.
	* ldexp.c: Formatting.
	* ldfile.c: Formatting.
	* ldlang.c: Formatting.
	* ldmain.c: Formatting.
	* ldwrite.c: Formatting.
This commit is contained in:
Alan Modra 2016-06-14 13:25:21 +09:30
parent 3860d2b4b7
commit 0aa7f5862e
10 changed files with 206 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ld/ChangeLog
View file

@ -1,3 +1,15 @@
2016-06-14 Alan Modra <amodra@gmail.com>
* ldbuildid.c: Formatting.
* ldcref.c: Formatting.
* ldctor.c: Formatting.
* ldemul.c: Formatting.
* ldexp.c: Formatting.
* ldfile.c: Formatting.
* ldlang.c: Formatting.
* ldmain.c: Formatting.
* ldwrite.c: Formatting.
2016-06-14 Alan Modra <amodra@gmail.com>
* ldlang.c: Expand uses of bfd_my_archive.

4
ld/ldbuildid.c
View file

@ -45,10 +45,10 @@ bfd_size_type
compute_build_id_size (const char *style)
{
if (streq (style, "md5") || streq (style, "uuid"))
return 128 / 8;
return 128 / 8;
if (streq (style, "sha1"))
return 160 / 8;
return 160 / 8;
if (strneq (style, "0x", 2))
{

23
ld/ldcref.c
View file

@ -112,8 +112,8 @@ static size_t cref_symcount;
static struct bfd_hash_entry **old_table;
static unsigned int old_size;
static unsigned int old_count;
static void * old_tab;
static void * alloc_mark;
static void *old_tab;
static void *alloc_mark;
static size_t tabsize, entsize, refsize;
static size_t old_symcount;
@ -163,7 +163,7 @@ add_cref (const char *name,
struct cref_hash_entry *h;
struct cref_ref *r;
if (! cref_initialized)
if (!cref_initialized)
{
if (!bfd_hash_table_init (&cref_table.root, cref_hash_newfunc,
sizeof (struct cref_hash_entry)))
@ -346,10 +346,10 @@ cref_fill_array (struct cref_hash_entry *h, void *data)
static int
cref_sort_array (const void *a1, const void *a2)
{
const struct cref_hash_entry * const *p1 =
(const struct cref_hash_entry * const *) a1;
const struct cref_hash_entry * const *p2 =
(const struct cref_hash_entry * const *) a2;
const struct cref_hash_entry *const *p1
= (const struct cref_hash_entry *const *) a1;
const struct cref_hash_entry *const *p2
= (const struct cref_hash_entry *const *) a2;
if (demangling)
return strcmp ((*p1)->demangled, (*p2)->demangled);
@ -379,7 +379,7 @@ output_cref (FILE *fp)
}
fprintf (fp, _("File\n"));
if (! cref_initialized)
if (!cref_initialized)
{
fprintf (fp, _("No symbols\n"));
return;
@ -473,7 +473,7 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h)
for (r = h->refs; r != NULL; r = r->next)
{
if (! r->def && ! r->common)
if (!r->def && !r->common)
{
while (len < FILECOL)
{
@ -493,7 +493,7 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h)
void
check_nocrossrefs (void)
{
if (! cref_initialized)
if (!cref_initialized)
return;
cref_hash_traverse (&cref_table, check_nocrossref, NULL);
@ -595,7 +595,8 @@ check_nocrossref (struct cref_hash_entry *h, void *ignore ATTRIBUTE_UNUSED)
/* The struct is used to pass information from check_refs to
check_reloc_refs through bfd_map_over_sections. */
struct check_refs_info {
struct check_refs_info
{
const char *sym_name;
asection *defsec;
struct lang_nocrossrefs *ncrs;

28
ld/ldctor.c
View file

@ -86,12 +86,12 @@ ldctor_add_set_entry (struct bfd_link_hash_entry *h,
}
/* Don't permit a set to be constructed from different object
file formats. The same reloc may have different results. We
actually could sometimes handle this, but the case is
unlikely to ever arise. Sometimes constructor symbols are in
unusual sections, such as the absolute section--this appears
to be the case in Linux a.out--and in such cases we just
assume everything is OK. */
file formats. The same reloc may have different results. We
actually could sometimes handle this, but the case is
unlikely to ever arise. Sometimes constructor symbols are in
unusual sections, such as the absolute section--this appears
to be the case in Linux a.out--and in such cases we just
assume everything is OK. */
if (p->elements != NULL
&& section->owner != NULL
&& p->elements->section->owner != NULL
@ -130,7 +130,7 @@ ctor_prio (const char *name)
while (*name == '_')
++name;
if (! CONST_STRNEQ (name, "GLOBAL_"))
if (!CONST_STRNEQ (name, "GLOBAL_"))
return -1;
name += sizeof "GLOBAL_" - 1;
@ -139,7 +139,7 @@ ctor_prio (const char *name)
return -1;
if (name[1] != 'I' && name[1] != 'D')
return -1;
if (! ISDIGIT (name[3]))
if (!ISDIGIT (name[3]))
return -1;
return atoi (name + 3);
@ -151,10 +151,10 @@ ctor_prio (const char *name)
static int
ctor_cmp (const void *p1, const void *p2)
{
const struct set_element * const *pe1 =
(const struct set_element * const *) p1;
const struct set_element * const *pe2 =
(const struct set_element * const *) p2;
const struct set_element *const *pe1
= (const struct set_element *const *) p1;
const struct set_element *const *pe2
= (const struct set_element *const *) p2;
const char *n1;
const char *n2;
int prio1;
@ -332,7 +332,7 @@ ldctor_build_sets (void)
{
int len;
if (! header_printed)
if (!header_printed)
{
minfo (_("\nSet Symbol\n\n"));
header_printed = TRUE;
@ -359,7 +359,7 @@ ldctor_build_sets (void)
}
/* Need SEC_KEEP for --gc-sections. */
if (! bfd_is_abs_section (e->section))
if (!bfd_is_abs_section (e->section))
e->section->flags |= SEC_KEEP;
if (bfd_link_relocatable (&link_info))

2
ld/ldemul.c
View file

@ -328,7 +328,7 @@ ldemul_list_emulation_options (FILE *f)
}
}
if (! options_found)
if (!options_found)
fprintf (f, _(" no emulation specific options.\n"));
}

29
ld/ldexp.c
View file

@ -82,7 +82,7 @@ exp_print_token (token_code_type code, int infix_p)
static const struct
{
token_code_type code;
const char * name;
const char *name;
}
table[] =
{
@ -441,7 +441,8 @@ fold_binary (etree_type *tree)
if (!seg->used
&& config.magic_demand_paged
&& (seg->value % config.maxpagesize) != 0)
einfo (_("%P: warning: address of `%s' isn't multiple of maximum page size\n"),
einfo (_("%P: warning: address of `%s' "
"isn't multiple of maximum page size\n"),
segment_name);
seg->used = TRUE;
new_rel_from_abs (seg->value);
@ -848,17 +849,17 @@ fold_name (etree_type *tree)
case LENGTH:
{
if (expld.phase != lang_first_phase_enum)
{
lang_memory_region_type *mem;
{
lang_memory_region_type *mem;
mem = lang_memory_region_lookup (tree->name.name, FALSE);
if (mem != NULL)
new_number (mem->length);
else
einfo (_("%F%S: undefined MEMORY region `%s'"
" referenced in expression\n"),
tree, tree->name.name);
}
mem = lang_memory_region_lookup (tree->name.name, FALSE);
if (mem != NULL)
new_number (mem->length);
else
einfo (_("%F%S: undefined MEMORY region `%s'"
" referenced in expression\n"),
tree, tree->name.name);
}
}
break;
@ -979,7 +980,7 @@ is_align_conditional (const etree_type *tree)
/* Subroutine of exp_fold_tree_1 for copying a symbol type. */
static void
try_copy_symbol_type (struct bfd_link_hash_entry * h, etree_type *src)
try_copy_symbol_type (struct bfd_link_hash_entry *h, etree_type *src)
{
if (src->type.node_class == etree_name)
{
@ -1186,7 +1187,7 @@ exp_fold_tree_1 (etree_type *tree)
tree->type.node_class = etree_provided;
/* Copy the symbol type if this is a simple assignment of
one symbol to another. Also, handle the case of a foldable
one symbol to another. Also, handle the case of a foldable
ternary conditional with names on either side. */
if (tree->assign.src->type.node_class == etree_name)
try_copy_symbol_type (h, tree->assign.src);

33
ld/ldfile.c
View file

@ -38,19 +38,19 @@
#include "plugin.h"
#endif /* ENABLE_PLUGINS */
bfd_boolean ldfile_assumed_script = FALSE;
const char * ldfile_output_machine_name = "";
bfd_boolean ldfile_assumed_script = FALSE;
const char *ldfile_output_machine_name = "";
unsigned long ldfile_output_machine;
enum bfd_architecture ldfile_output_architecture;
search_dirs_type * search_head;
search_dirs_type *search_head;
#ifdef VMS
static char * slash = "";
static char *slash = "";
#else
#if defined (_WIN32) && ! defined (__CYGWIN32__)
static char * slash = "\\";
#if defined (_WIN32) && !defined (__CYGWIN32__)
static char *slash = "\\";
#else
static char * slash = "/";
static char *slash = "/";
#endif
#endif
@ -172,12 +172,12 @@ ldfile_try_open_bfd (const char *attempt,
if (check != NULL)
{
if (! bfd_check_format (check, bfd_object))
if (!bfd_check_format (check, bfd_object))
{
if (check == entry->the_bfd
&& entry->flags.search_dirs
&& bfd_get_error () == bfd_error_file_not_recognized
&& ! ldemul_unrecognized_file (entry))
&& !ldemul_unrecognized_file (entry))
{
int token, skip = 0;
char *arg, *arg1, *arg2, *arg3;
@ -284,9 +284,10 @@ ldfile_try_open_bfd (const char *attempt,
&& !bfd_arch_get_compatible (check, link_info.output_bfd,
command_line.accept_unknown_input_arch)
/* XCOFF archives can have 32 and 64 bit objects. */
&& ! (bfd_get_flavour (check) == bfd_target_xcoff_flavour
&& bfd_get_flavour (link_info.output_bfd) == bfd_target_xcoff_flavour
&& bfd_check_format (entry->the_bfd, bfd_archive)))
&& !(bfd_get_flavour (check) == bfd_target_xcoff_flavour
&& (bfd_get_flavour (link_info.output_bfd)
== bfd_target_xcoff_flavour)
&& bfd_check_format (entry->the_bfd, bfd_archive)))
{
if (command_line.warn_search_mismatch)
einfo (_("%P: skipping incompatible %s "
@ -333,7 +334,7 @@ ldfile_open_file_search (const char *arch,
/* If this is not an archive, try to open it in the current
directory first. */
if (! entry->flags.maybe_archive)
if (!entry->flags.maybe_archive)
{
if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
{
@ -393,7 +394,7 @@ ldfile_open_file (lang_input_statement_type *entry)
if (entry->the_bfd != NULL)
return;
if (! entry->flags.search_dirs)
if (!entry->flags.search_dirs)
{
if (ldfile_try_open_bfd (entry->filename, entry))
return;
@ -627,8 +628,8 @@ void
ldfile_add_arch (const char *in_name)
{
char *name = xstrdup (in_name);
search_arch_type *new_arch = (search_arch_type *)
xmalloc (sizeof (search_arch_type));
search_arch_type *new_arch
= (search_arch_type *) xmalloc (sizeof (search_arch_type));
ldfile_output_machine_name = in_name;

181
ld/ldlang.c
View file

@ -862,7 +862,7 @@ walk_wild_file (lang_wild_statement_type *s,
void *data)
{
if (f->the_bfd == NULL
|| ! bfd_check_format (f->the_bfd, bfd_archive))
|| !bfd_check_format (f->the_bfd, bfd_archive))
walk_wild_section (s, f, callback, data);
else
{
@ -1081,12 +1081,12 @@ new_afile (const char *name,
break;
case lang_input_file_is_l_enum:
if (name[0] == ':' && name[1] != '\0')
{
p->filename = name + 1;
p->flags.full_name_provided = TRUE;
}
{
p->filename = name + 1;
p->flags.full_name_provided = TRUE;
}
else
p->filename = name;
p->filename = name;
p->local_sym_name = concat ("-l", name, (const char *) NULL);
p->flags.maybe_archive = TRUE;
p->flags.real = TRUE;
@ -1330,11 +1330,11 @@ lang_memory_region_lookup (const char *const name, bfd_boolean create)
}
void
lang_memory_region_alias (const char * alias, const char * region_name)
lang_memory_region_alias (const char *alias, const char *region_name)
{
lang_memory_region_name * n;
lang_memory_region_type * r;
lang_memory_region_type * region;
lang_memory_region_name *n;
lang_memory_region_type *r;
lang_memory_region_type *region;
/* The default region must be unique. This ensures that it is not necessary
to iterate through the name list if someone wants the check if a region is
@ -1371,7 +1371,7 @@ lang_memory_region_alias (const char * alias, const char * region_name)
}
static lang_memory_region_type *
lang_memory_default (asection * section)
lang_memory_default (asection *section)
{
lang_memory_region_type *p;
@ -1841,7 +1841,7 @@ lang_insert_orphan (asection *s,
/* If the name of the section is representable in C, then create
symbols to mark the start and the end of the section. */
for (ps = secname; *ps != '\0'; ps++)
if (! ISALNUM ((unsigned char) *ps) && *ps != '_')
if (!ISALNUM ((unsigned char) *ps) && *ps != '_')
break;
if (*ps == '\0')
{
@ -2091,7 +2091,7 @@ lang_map (void)
|| s->output_section->owner != link_info.output_bfd)
&& (s->flags & (SEC_LINKER_CREATED | SEC_KEEP)) == 0)
{
if (! dis_header_printed)
if (!dis_header_printed)
{
fprintf (config.map_file, _("\nDiscarded input sections\n\n"));
dis_header_printed = TRUE;
@ -2145,7 +2145,7 @@ lang_map (void)
fprintf (config.map_file, _("\nLinker script and memory map\n\n"));
if (! link_info.reduce_memory_overheads)
if (!link_info.reduce_memory_overheads)
{
obstack_begin (&map_obstack, 1000);
bfd_link_hash_traverse (link_info.hash, sort_def_symbol, 0);
@ -2153,7 +2153,8 @@ lang_map (void)
lang_statement_iteration++;
print_statements ();
ldemul_extra_map_file_text (link_info.output_bfd, &link_info, config.map_file);
ldemul_extra_map_file_text (link_info.output_bfd, &link_info,
config.map_file);
}
static bfd_boolean
@ -2204,7 +2205,8 @@ init_os (lang_output_section_statement_type *s, flagword flags)
s->name, flags);
if (s->bfd_section == NULL)
{
einfo (_("%P%F: output format %s cannot represent section called %s: %E\n"),
einfo (_("%P%F: output format %s cannot represent section"
" called %s: %E\n"),
link_info.output_bfd->xvec->name, s->name);
}
s->bfd_section->output_section = s->bfd_section;
@ -2664,7 +2666,7 @@ lookup_name (const char *name)
if (search->flags.loaded || !search->flags.real)
return search;
if (! load_symbols (search, NULL))
if (!load_symbols (search, NULL))
return NULL;
return search;
@ -2748,8 +2750,8 @@ load_symbols (lang_input_statement_type *entry,
if (entry->flags.missing_file)
return TRUE;
if (! bfd_check_format (entry->the_bfd, bfd_archive)
&& ! bfd_check_format_matches (entry->the_bfd, bfd_object, &matching))
if (!bfd_check_format (entry->the_bfd, bfd_archive)
&& !bfd_check_format_matches (entry->the_bfd, bfd_object, &matching))
{
bfd_error_type err;
struct lang_input_statement_flags save_flags;
@ -2843,7 +2845,7 @@ load_symbols (lang_input_statement_type *entry,
if (member == NULL)
break;
if (! bfd_check_format (member, bfd_object))
if (!bfd_check_format (member, bfd_object))
{
einfo (_("%F%B: member %B in archive is not an object\n"),
entry->the_bfd, member);
@ -3169,9 +3171,9 @@ open_output (const char *name)
delete_output_file_on_failure = TRUE;
if (! bfd_set_format (link_info.output_bfd, bfd_object))
if (!bfd_set_format (link_info.output_bfd, bfd_object))
einfo (_("%P%F:%s: can not make object file: %E\n"), name);
if (! bfd_set_arch_mach (link_info.output_bfd,
if (!bfd_set_arch_mach (link_info.output_bfd,
ldfile_output_architecture,
ldfile_output_machine))
einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
@ -3320,7 +3322,7 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
os_tail = lang_output_section_statement.tail;
lang_list_init (&add);
if (! load_symbols (&s->input_statement, &add))
if (!load_symbols (&s->input_statement, &add))
config.make_executable = FALSE;
if (add.head != NULL)
@ -3442,7 +3444,7 @@ static struct require_defined_symbol *require_defined_symbol_list;
defined. */
void
ldlang_add_require_defined (const char * const name)
ldlang_add_require_defined (const char *const name)
{
struct require_defined_symbol *ptr;
@ -3466,11 +3468,11 @@ ldlang_check_require_defined_symbols (void)
struct bfd_link_hash_entry *h;
h = bfd_link_hash_lookup (link_info.hash, ptr->name,
FALSE, FALSE, TRUE);
FALSE, FALSE, TRUE);
if (h == NULL
|| (h->type != bfd_link_hash_defined
&& h->type != bfd_link_hash_defweak))
einfo(_("%P%X: required symbol `%s' not defined\n"), ptr->name);
|| (h->type != bfd_link_hash_defined
&& h->type != bfd_link_hash_defweak))
einfo(_("%P%X: required symbol `%s' not defined\n"), ptr->name);
}
}
@ -3488,19 +3490,19 @@ check_input_sections
case lang_wild_statement_enum:
walk_wild (&s->wild_statement, check_section_callback,
output_section_statement);
if (! output_section_statement->all_input_readonly)
if (!output_section_statement->all_input_readonly)
return;
break;
case lang_constructors_statement_enum:
check_input_sections (constructor_list.head,
output_section_statement);
if (! output_section_statement->all_input_readonly)
if (!output_section_statement->all_input_readonly)
return;
break;
case lang_group_statement_enum:
check_input_sections (s->group_statement.children.head,
output_section_statement);
if (! output_section_statement->all_input_readonly)
if (!output_section_statement->all_input_readonly)
return;
break;
default:
@ -4091,9 +4093,9 @@ print_assignment (lang_assignment_statement_type *assignment,
else
{
if (assignment->exp->type.node_class == etree_provide)
minfo ("[!provide]");
minfo ("[!provide]");
else
minfo ("*undef* ");
minfo ("*undef* ");
#ifdef BFD64
minfo (" ");
#endif
@ -4171,7 +4173,8 @@ print_all_symbols (asection *sec)
/* Sort the symbols by address. */
entries = (struct bfd_link_hash_entry **)
obstack_alloc (&map_obstack, ud->map_symbol_def_count * sizeof (*entries));
obstack_alloc (&map_obstack,
ud->map_symbol_def_count * sizeof (*entries));
for (i = 0, def = ud->map_symbol_def_head; def; def = def->next, i++)
entries[i] = def->entry;
@ -5143,8 +5146,8 @@ lang_size_sections_1
so people can fix their linker scripts. */
if (last->vma != last->lma)
einfo (_("%P: warning: dot moved backwards before `%s'\n"),
os->name);
einfo (_("%P: warning: dot moved backwards "
"before `%s'\n"), os->name);
}
else
{
@ -5311,7 +5314,7 @@ lang_size_sections_1
{
bfd_boolean again;
if (! bfd_relax_section (i->owner, i, &link_info, &again))
if (!bfd_relax_section (i->owner, i, &link_info, &again))
einfo (_("%P%F: can't relax section: %E\n"));
if (again)
*relax = TRUE;
@ -5449,14 +5452,14 @@ lang_size_sections_1
segments. We are allowed an opportunity to override this decision. */
bfd_boolean
ldlang_override_segment_assignment (struct bfd_link_info * info ATTRIBUTE_UNUSED,
bfd * abfd ATTRIBUTE_UNUSED,
asection * current_section,
asection * previous_section,
ldlang_override_segment_assignment (struct bfd_link_info *info ATTRIBUTE_UNUSED,
bfd *abfd ATTRIBUTE_UNUSED,
asection *current_section,
asection *previous_section,
bfd_boolean new_segment)
{
lang_output_section_statement_type * cur;
lang_output_section_statement_type * prev;
lang_output_section_statement_type *cur;
lang_output_section_statement_type *prev;
/* The checks below are only necessary when the BFD library has decided
that the two sections ought to be placed into the same segment. */
@ -5631,7 +5634,8 @@ lang_do_assignments_1 (lang_statement_union_type *s,
dot += TO_ADDR (os->bfd_section->size);
if (os->update_dot_tree != NULL)
exp_fold_tree (os->update_dot_tree, bfd_abs_section_ptr, &dot);
exp_fold_tree (os->update_dot_tree, bfd_abs_section_ptr,
&dot);
}
}
break;
@ -5925,7 +5929,7 @@ lang_end (void)
+ bfd_get_section_vma (link_info.output_bfd,
h->u.def.section->output_section)
+ h->u.def.section->output_offset);
if (! bfd_set_start_address (link_info.output_bfd, val))
if (!bfd_set_start_address (link_info.output_bfd, val))
einfo (_("%P%F:%s: can't set start address\n"), entry_symbol.name);
}
else
@ -5938,7 +5942,7 @@ lang_end (void)
val = bfd_scan_vma (entry_symbol.name, &send, 0);
if (*send == '\0')
{
if (! bfd_set_start_address (link_info.output_bfd, val))
if (!bfd_set_start_address (link_info.output_bfd, val))
einfo (_("%P%F: can't set start address\n"));
}
else
@ -6043,15 +6047,15 @@ lang_check (void)
function which will do nothing. We still want to call
bfd_merge_private_bfd_data, since it may set up
information which is needed in the output file. */
if (! command_line.warn_mismatch)
if (!command_line.warn_mismatch)
pfn = bfd_set_error_handler (ignore_bfd_errors);
if (! bfd_merge_private_bfd_data (input_bfd, link_info.output_bfd))
if (!bfd_merge_private_bfd_data (input_bfd, link_info.output_bfd))
{
if (command_line.warn_mismatch)
einfo (_("%P%X: failed to merge target specific data"
" of file %B\n"), input_bfd);
}
if (! command_line.warn_mismatch)
if (!command_line.warn_mismatch)
bfd_set_error_handler (pfn);
}
}
@ -6067,10 +6071,10 @@ lang_common (void)
if (command_line.inhibit_common_definition)
return;
if (bfd_link_relocatable (&link_info)
&& ! command_line.force_common_definition)
&& !command_line.force_common_definition)
return;
if (! config.sort_common)
if (!config.sort_common)
bfd_link_hash_traverse (link_info.hash, lang_one_common, NULL);
else
{
@ -6129,7 +6133,7 @@ lang_one_common (struct bfd_link_hash_entry *h, void *info)
char *name;
char buf[50];
if (! header_printed)
if (!header_printed)
{
minfo (_("\nAllocating common symbols\n"));
minfo (_("Common symbol size file\n\n"));
@ -6289,7 +6293,7 @@ lang_set_flags (lang_memory_region_type *ptr, const char *flags, int invert)
/* PR 17900: An exclamation mark in the attributes reverses
the sense of any of the attributes that follow. */
case '!':
invert = ! invert;
invert = !invert;
ptr_flags = invert ? &ptr->not_flags : &ptr->flags;
break;
@ -6315,7 +6319,8 @@ lang_set_flags (lang_memory_region_type *ptr, const char *flags, int invert)
break;
default:
einfo (_("%P%F: invalid character %c (%d) in flags\n"), * flags, * flags);
einfo (_("%P%F: invalid character %c (%d) in flags\n"),
*flags, *flags);
break;
}
flags++;
@ -6441,7 +6446,8 @@ lang_enter_output_section_statement (const char *output_section_statement_name,
os->align_lma_with_input = align_with_input == ALIGN_WITH_INPUT;
if (os->align_lma_with_input && align != NULL)
einfo (_("%F%P:%S: error: align with input and explicit align specified\n"), NULL);
einfo (_("%F%P:%S: error: align with input and explicit align specified\n"),
NULL);
os->subsection_alignment =
topower (exp_get_value_int (subalign, -1, "subsection alignment"));
@ -6719,7 +6725,7 @@ find_replacements_insert_point (void)
if (claim1->flags.claimed)
return claim1->flags.claim_archive ? lastobject : claim1;
/* Update lastobject if this is a real object file. */
if (claim1->the_bfd && (claim1->the_bfd->my_archive == NULL))
if (claim1->the_bfd != NULL && claim1->the_bfd->my_archive == NULL)
lastobject = claim1;
}
/* No files were claimed by the plugin. Choose the last object
@ -6764,7 +6770,7 @@ lang_list_remove_tail (lang_statement_list_type *destlist,
/* Add NAME to the list of garbage collection entry points. */
void
lang_add_gc_name (const char * name)
lang_add_gc_name (const char *name)
{
struct bfd_sym_chain *sym;
@ -6882,7 +6888,8 @@ lang_process (void)
}
#endif /* ENABLE_PLUGINS */
/* Make sure that nobody has tried to add a symbol to this list before now. */
/* Make sure that nobody has tried to add a symbol to this list
before now. */
ASSERT (link_info.gc_sym_list == NULL);
link_info.gc_sym_list = &entry_symbol;
@ -6990,7 +6997,7 @@ lang_process (void)
lang_find_relro_sections ();
/* Size up the sections. */
lang_size_sections (NULL, ! RELAXATION_ENABLED);
lang_size_sections (NULL, !RELAXATION_ENABLED);
/* See if anything special should be done now we know how big
everything is. This is where relaxation is done. */
@ -7044,7 +7051,7 @@ lang_add_wild (struct wildcard_spec *filespec,
{
if (strcmp (filespec->name, "*") == 0)
filespec->name = NULL;
else if (! wildcardp (filespec->name))
else if (!wildcardp (filespec->name))
lang_has_input_file = TRUE;
}
@ -7086,7 +7093,7 @@ lang_add_entry (const char *name, bfd_boolean cmdline)
{
if (entry_symbol.name == NULL
|| cmdline
|| ! entry_from_cmdline)
|| !entry_from_cmdline)
{
entry_symbol.name = name;
entry_from_cmdline = cmdline;
@ -7233,7 +7240,7 @@ lang_get_regions (lang_memory_region_type **region,
has been specified, then use the load region for the runtime region
as well. */
if (lma_memspec != NULL
&& ! have_vma
&& !have_vma
&& strcmp (memspec, DEFAULT_MEMORY_REGION) == 0)
*region = *lma_region;
else
@ -7421,7 +7428,7 @@ lang_record_phdrs (void)
if (last == NULL)
{
lang_output_section_statement_type * tmp_os;
lang_output_section_statement_type *tmp_os;
/* If we have not run across a section with a program
header assigned to it yet, then scan forwards to find
@ -7473,9 +7480,9 @@ lang_record_phdrs (void)
else
at = exp_get_vma (l->at, 0, "phdr load address");
if (! bfd_record_phdr (link_info.output_bfd, l->type,
l->flags != NULL, flags, l->at != NULL,
at, l->filehdr, l->phdrs, c, secs))
if (!bfd_record_phdr (link_info.output_bfd, l->type,
l->flags != NULL, flags, l->at != NULL,
at, l->filehdr, l->phdrs, c, secs))
einfo (_("%F%P: bfd_record_phdr failed: %E\n"));
}
@ -7495,7 +7502,7 @@ lang_record_phdrs (void)
for (pl = os->phdrs;
pl != NULL;
pl = pl->next)
if (! pl->used && strcmp (pl->name, "NONE") != 0)
if (!pl->used && strcmp (pl->name, "NONE") != 0)
einfo (_("%X%P: section `%s' assigned to non-existent phdr `%s'\n"),
os->name, pl->name);
}
@ -8223,24 +8230,26 @@ lang_do_memory_regions (void)
for (; r != NULL; r = r->next)
{
if (r->origin_exp)
{
exp_fold_tree_no_dot (r->origin_exp);
if (expld.result.valid_p)
{
r->origin = expld.result.value;
r->current = r->origin;
}
else
einfo (_("%F%P: invalid origin for memory region %s\n"), r->name_list.name);
}
{
exp_fold_tree_no_dot (r->origin_exp);
if (expld.result.valid_p)
{
r->origin = expld.result.value;
r->current = r->origin;
}
else
einfo (_("%F%P: invalid origin for memory region %s\n"),
r->name_list.name);
}
if (r->length_exp)
{
exp_fold_tree_no_dot (r->length_exp);
if (expld.result.valid_p)
r->length = expld.result.value;
else
einfo (_("%F%P: invalid length for memory region %s\n"), r->name_list.name);
}
{
exp_fold_tree_no_dot (r->length_exp);
if (expld.result.valid_p)
r->length = expld.result.value;
else
einfo (_("%F%P: invalid length for memory region %s\n"),
r->name_list.name);
}
}
}
@ -8289,7 +8298,7 @@ lang_append_dynamic_list (struct bfd_elf_version_expr *dynamic)
void
lang_append_dynamic_list_cpp_typeinfo (void)
{
const char * symbols [] =
const char *symbols[] =
{
"typeinfo name for*",
"typeinfo for*"
@ -8310,7 +8319,7 @@ lang_append_dynamic_list_cpp_typeinfo (void)
void
lang_append_dynamic_list_cpp_new (void)
{
const char * symbols [] =
const char *symbols[] =
{
"operator new*",
"operator delete*"

46
ld/ldmain.c
View file

@ -76,7 +76,7 @@ char *program_name;
const char *ld_sysroot;
/* The canonical representation of ld_sysroot. */
char * ld_canon_sysroot;
char *ld_canon_sysroot;
int ld_canon_sysroot_len;
/* Set by -G argument, for targets like MIPS ELF. */
@ -232,7 +232,7 @@ main (int argc, char **argv)
this permits the linker to be configured for a particular target,
and linked against a shared BFD library which was configured for
a different target. The macro TARGET is defined by Makefile. */
if (! bfd_set_default_target (TARGET))
if (!bfd_set_default_target (TARGET))
{
einfo (_("%X%P: can't set BFD default target to `%s': %E\n"), TARGET);
xexit (1);
@ -440,7 +440,7 @@ main (int argc, char **argv)
lang_print_memory_usage ();
#if 0
{
struct bfd_link_hash_entry * h;
struct bfd_link_hash_entry *h;
h = bfd_link_hash_lookup (link_info.hash, "__image_base__", 0,0,1);
fprintf (stderr, "lookup = %p val %lx\n", h, h ? h->u.def.value : 1);
@ -463,7 +463,7 @@ main (int argc, char **argv)
}
else
{
if (! bfd_close (link_info.output_bfd))
if (!bfd_close (link_info.output_bfd))
einfo (_("%F%B: final close failed: %E\n"), link_info.output_bfd);
/* If the --force-exe-suffix is enabled, and we're making an
@ -654,8 +654,8 @@ add_ysym (const char *name)
{
if (link_info.notice_hash == NULL)
{
link_info.notice_hash =
(struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table));
link_info.notice_hash
= (struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table));
if (!bfd_hash_table_init_n (link_info.notice_hash,
bfd_hash_newfunc,
sizeof (struct bfd_hash_entry),
@ -673,10 +673,10 @@ add_ignoresym (struct bfd_link_info *info, const char *name)
if (info->ignore_hash == NULL)
{
info->ignore_hash = xmalloc (sizeof (struct bfd_hash_table));
if (! bfd_hash_table_init_n (info->ignore_hash,
bfd_hash_newfunc,
sizeof (struct bfd_hash_entry),
61))
if (!bfd_hash_table_init_n (info->ignore_hash,
bfd_hash_newfunc,
sizeof (struct bfd_hash_entry),
61))
einfo (_("%P%F: bfd_hash_table_init failed: %E\n"));
}
@ -691,8 +691,8 @@ add_wrap (const char *name)
{
if (link_info.wrap_hash == NULL)
{
link_info.wrap_hash =
(struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table));
link_info.wrap_hash
= (struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table));
if (!bfd_hash_table_init_n (link_info.wrap_hash,
bfd_hash_newfunc,
sizeof (struct bfd_hash_entry),
@ -744,7 +744,7 @@ add_keepsyms_file (const char *filename)
{
size_t len = 0;
while (! ISSPACE (c) && c != EOF)
while (!ISSPACE (c) && c != EOF)
{
buf[len] = c;
++len;
@ -855,7 +855,7 @@ add_archive_element (struct bfd_link_info *info,
}
}
if (! header_printed)
if (!header_printed)
{
char buf[100];
@ -952,10 +952,10 @@ multiple_definition (struct bfd_link_info *info,
FIXME: It would be cleaner to somehow ignore symbols defined in
sections which are being discarded. */
if ((osec->output_section != NULL
&& ! bfd_is_abs_section (osec)
&& !bfd_is_abs_section (osec)
&& bfd_is_abs_section (osec->output_section))
|| (nsec->output_section != NULL
&& ! bfd_is_abs_section (nsec)
&& !bfd_is_abs_section (nsec)
&& bfd_is_abs_section (nsec->output_section)))
return;
@ -1083,7 +1083,7 @@ add_to_set (struct bfd_link_info *info ATTRIBUTE_UNUSED,
einfo (_("%P: warning: global constructor %s used\n"),
h->root.string);
if (! config.build_constructors)
if (!config.build_constructors)
return;
ldctor_add_set_entry (h, reloc, NULL, section, value);
@ -1118,7 +1118,7 @@ constructor_callback (struct bfd_link_info *info,
if (config.warn_constructors)
einfo (_("%P: warning: global constructor %s used\n"), name);
if (! config.build_constructors)
if (!config.build_constructors)
return;
/* Ensure that BFD_RELOC_CTOR exists now, so that we can give a
@ -1193,7 +1193,7 @@ warning_callback (struct bfd_link_info *info ATTRIBUTE_UNUSED,
{
/* This is a hack to support warn_multiple_gp. FIXME: This should
have a cleaner interface, but what? */
if (! config.warn_multiple_gp
if (!config.warn_multiple_gp
&& strcmp (warning, "using multiple gp values") == 0)
return;
@ -1203,7 +1203,7 @@ warning_callback (struct bfd_link_info *info ATTRIBUTE_UNUSED,
einfo ("%P: %s%s\n", _("warning: "), warning);
else if (symbol == NULL)
einfo ("%B: %s%s\n", abfd, _("warning: "), warning);
else if (! symbol_warning (warning, symbol, abfd))
else if (!symbol_warning (warning, symbol, abfd))
{
bfd *b;
/* Search all input files for a reference to SYMBOL. */
@ -1391,12 +1391,14 @@ reloc_overflow (struct bfd_link_info *info,
{
case bfd_link_hash_undefined:
case bfd_link_hash_undefweak:
einfo (_(" relocation truncated to fit: %s against undefined symbol `%T'"),
einfo (_(" relocation truncated to fit: "
"%s against undefined symbol `%T'"),
reloc_name, entry->root.string);
break;
case bfd_link_hash_defined:
case bfd_link_hash_defweak:
einfo (_(" relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"),
einfo (_(" relocation truncated to fit: "
"%s against symbol `%T' defined in %A section in %B"),
reloc_name, entry->root.string,
entry->u.def.section,
entry->u.def.section == bfd_abs_section_ptr

32
ld/ldwrite.c
View file

@ -91,17 +91,17 @@ build_link_order (lang_statement_union_type *statement)
big_endian = TRUE;
{
LANG_FOR_EACH_INPUT_STATEMENT (s)
{
if (s->the_bfd != NULL)
{
if (bfd_little_endian (s->the_bfd))
{
big_endian = FALSE;
swap = TRUE;
}
break;
}
}
{
if (s->the_bfd != NULL)
{
if (bfd_little_endian (s->the_bfd))
{
big_endian = FALSE;
swap = TRUE;
}
break;
}
}
}
}
@ -209,7 +209,7 @@ build_link_order (lang_statement_union_type *statement)
link_order->size = bfd_get_reloc_size (rs->howto);
link_order->u.reloc.p = (struct bfd_link_order_reloc *)
xmalloc (sizeof (struct bfd_link_order_reloc));
xmalloc (sizeof (struct bfd_link_order_reloc));
link_order->u.reloc.p->reloc = rs->reloc;
link_order->u.reloc.p->addend = rs->addend_value;
@ -409,13 +409,9 @@ ds (asection *s)
while (l)
{
if (l->type == bfd_indirect_link_order)
{
printf ("%8x %s\n", l->offset, l->u.indirect.section->owner->filename);
}
printf ("%8x %s\n", l->offset, l->u.indirect.section->owner->filename);
else
{
printf (_("%8x something else\n"), l->offset);
}
printf (_("%8x something else\n"), l->offset);
l = l->next;
}
printf ("\n");