aboutsummaryrefslogtreecommitdiff
path: root/ld/ldfile.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-06-14 13:25:21 +0930
committerAlan Modra <amodra@gmail.com>2016-06-14 13:25:21 +0930
commit0aa7f5862e5619194b3956d5bd45b93970635bde (patch)
treeec56aa7d659a0aeae143cb5795453bf325f40bf2 /ld/ldfile.c
parent3860d2b4b72feeef4cf045c6c9907a0476f46f3d (diff)
downloadfsf-binutils-gdb-0aa7f5862e5619194b3956d5bd45b93970635bde.zip
fsf-binutils-gdb-0aa7f5862e5619194b3956d5bd45b93970635bde.tar.gz
fsf-binutils-gdb-0aa7f5862e5619194b3956d5bd45b93970635bde.tar.bz2
Formatting fixes.
* 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.
Diffstat (limited to 'ld/ldfile.c')
-rw-r--r--ld/ldfile.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 8009ba7..e397737 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -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;