svn commit: r357351 - in stable: 10/contrib/binutils/bfd 11/contrib/binutils/bfd 12/contrib/binutils/bfd 9/contrib/binutils/bfd

[Dimitry Andric]

Author: dim
Date: Fri Jan 31 20:04:32 2020
New Revision: 357351
URL: https://svnweb.freebsd.org/changeset/base/357351

Log:
  MFC r357226:
  
  Merge r357224 from the clang1000-import branch:
  
  Fix the following -Werror warning from clang 10.0.0 in binutils:
  
  contrib/binutils/bfd/peicode.h:1356:3: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
                  if (efi)
                  ^
  contrib/binutils/bfd/peicode.h:1353:8: note: previous statement is here
                if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch)
                ^
  contrib/binutils/bfd/peicode.h:1370:3: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
                  if (!efi)
                  ^
  contrib/binutils/bfd/peicode.h:1367:8: note: previous statement is here
                if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch)
                ^

Modified:
  stable/9/contrib/binutils/bfd/peicode.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/   (props changed)
  stable/9/contrib/binutils/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/contrib/binutils/bfd/peicode.h
  stable/11/contrib/binutils/bfd/peicode.h
  stable/12/contrib/binutils/bfd/peicode.h
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/9/contrib/binutils/bfd/peicode.h
==============================================================================
--- stable/9/contrib/binutils/bfd/peicode.h	Fri Jan 31 19:40:40 2020	(r357350)
+++ stable/9/contrib/binutils/bfd/peicode.h	Fri Jan 31 20:04:32 2020	(r357351)
@@ -1353,13 +1353,13 @@ pe_bfd_object_p (bfd * abfd)
 	      if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch)
 		continue;
 
-		if (efi)
-		  {
-		    /* TARGET_PTR is an EFI backend.  Don't match
-		       TARGET with a EFI file.  */
-		    bfd_set_error (bfd_error_wrong_format);
-		    return NULL;
-		  }
+	      if (efi)
+		{
+		  /* TARGET_PTR is an EFI backend.  Don't match
+		     TARGET with a EFI file.  */
+		  bfd_set_error (bfd_error_wrong_format);
+		  return NULL;
+		}
 	    }
 	  else if (bfd_target_pei_p (*target_ptr))
 	    {
@@ -1367,13 +1367,13 @@ pe_bfd_object_p (bfd * abfd)
 	      if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch)
 		continue;
 
-		if (!efi)
-		  {
-		    /* TARGET_PTR is a PE backend.  Don't match
-		       TARGET with a PE file.  */
-		    bfd_set_error (bfd_error_wrong_format);
-		    return NULL;
-		  }
+	      if (!efi)
+		{
+		  /* TARGET_PTR is a PE backend.  Don't match
+		     TARGET with a PE file.  */
+		  bfd_set_error (bfd_error_wrong_format);
+		  return NULL;
+		}
 	    }
 	}
     }