X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldfile.c;h=e3977377b8d574030c577586a6be1c04b6d35c29;hb=0c66ea4c5e46372c7411f67b0ba21d7de5215958;hp=8009ba7e9c6707bc9c28a0e51dbce02f6f35e852;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 8009ba7e9c..e3977377b8 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;