X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fnetbsd.h;h=147918f94b4997d7f039646ab5fff1076f71084f;hb=7e94cf6cb018df7cc1311afb2b15e9f69adb60d9;hp=abd5fe7ba55947d105b46229f5b56ae588cabd23;hpb=bbb1afc89b5cfa2f09b6a7c25fbfef745fbdd724;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/netbsd.h b/bfd/netbsd.h
index abd5fe7ba5..147918f94b 100644
--- a/bfd/netbsd.h
+++ b/bfd/netbsd.h
@@ -1,5 +1,5 @@
 /* BFD back-end definitions used by all NetBSD targets.
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +31,7 @@
 #define N_HEADER_IN_TEXT(x)	1
 
 /* Determine if this is a shared library using the flags.  */
-#define N_SHARED_LIB(x) 	(N_DYNAMIC (x))
+#define N_SHARED_LIB(x)		(N_DYNAMIC (x))
 
 /* We have 6 bits of flags and 10 bits of machine ID.  */
 #define N_MACHTYPE(execp) \
@@ -45,10 +45,10 @@
 	 | (((flags) & 0x3f) << 24))
 #define N_SET_MACHTYPE(execp, machtype) \
 	((execp)->a_info = \
-         ((execp)->a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
+	 ((execp)->a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
 #define N_SET_FLAGS(execp, flags) \
 	((execp)->a_info = \
-	 ((execp)->a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
+	 ((execp)->a_info & 0x03ffffff) | ((flags & 0x3fu) << 26))
 
 #include "sysdep.h"
 #include "bfd.h"
@@ -84,12 +84,7 @@ MY (write_object_contents) (bfd *abfd)
      will normally have been done by set_section_contents, but only if
      there actually are some section contents.  */
   if (! abfd->output_has_begun)
-    {
-      bfd_size_type text_size;
-      file_ptr text_end;
-
-      NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end);
-    }
+    NAME (aout, adjust_sizes_and_vmas) (abfd);
 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 
@@ -109,7 +104,7 @@ MY (write_object_contents) (bfd *abfd)
   /* XXX aren't there any macro to change byteorder of a word independent of
      the host's or target's endiannesses?  */
   execp->a_info
-    = (execp->a_info & 0xff) << 24 | (execp->a_info & 0xff00) << 8
+    = (execp->a_info & 0xffu) << 24 | (execp->a_info & 0xff00) << 8
       | (execp->a_info & 0xff0000) >> 8 | (execp->a_info & 0xff000000) >> 24;
 #endif