s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

comparisons of bfd_boolean vars with TRUE/FALSE.  Formatting.

1 files changed, 41 insertions, 40 deletions

diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index 64dd04ecab0..a1f7d0d48f1 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -25,8 +25,9 @@
 
 int    set_dlx_skip_hi16_flag PARAMS ((int));
 
-static boolean elf32_dlx_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
+static bfd_boolean elf32_dlx_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
 static void elf32_dlx_info_to_howto
   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 static void elf32_dlx_info_to_howto_rel
@@ -57,45 +58,45 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   0,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   0,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_NONE",          /* name */
-	   false,                 /* partial_inplace */
+	   FALSE,                 /* partial_inplace */
 	   0,                     /* src_mask */
 	   0,                     /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* 8 bit relocation.  */
     HOWTO (R_DLX_RELOC_8,         /* type */
 	   0,                     /* rightshift */
 	   0,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   8,                     /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_8",       /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xff,                  /* src_mask */
 	   0xff,                  /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* 16 bit relocation.  */
     HOWTO (R_DLX_RELOC_16,        /* type */
 	   0,                     /* rightshift */
 	   1,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   16,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_16",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xffff,                /* src_mask */
 	   0xffff,                /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
 #if 0
     /* 26 bit jump address.  */
@@ -103,17 +104,17 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   26,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   /* This needs complex overflow detection, because the upper four
 	      bits must match the PC + 4.  */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_26",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0x3ffffff,             /* src_mask */
 	   0x3ffffff,             /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 #endif
 
     /* 32 bit relocation.  */
@@ -121,45 +122,45 @@ static reloc_howto_type dlx_elf_howto_table[]=
 	   0,                     /* rightshift */
 	   2,                     /* size (0 = byte, 1 = short, 2 = long) */
 	   32,                    /* bitsize */
-	   false,                 /* pc_relative */
+	   FALSE,                 /* pc_relative */
 	   0,                     /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   bfd_elf_generic_reloc, /* special_function */
 	   "R_DLX_RELOC_32",      /* name */
-	   true,                  /* partial_inplace */
+	   TRUE,                  /* partial_inplace */
 	   0xffffffff,            /* src_mask */
 	   0xffffffff,            /* dst_mask */
-	   false),                /* pcrel_offset */
+	   FALSE),                /* pcrel_offset */
 
     /* GNU extension to record C++ vtable hierarchy */
     HOWTO (R_DLX_GNU_VTINHERIT,   /* type */
 	   0,			  /* rightshift */
 	   2,			  /* size (0 = byte, 1 = short, 2 = long) */
 	   0,			  /* bitsize */
-	   false,		  /* pc_relative */
+	   FALSE,		  /* pc_relative */
 	   0,			  /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   NULL,		  /* special_function */
 	   "R_DLX_GNU_VTINHERIT", /* name */
-	   false,		  /* partial_inplace */
+	   FALSE,		  /* partial_inplace */
 	   0,			  /* src_mask */
 	   0,			  /* dst_mask */
-	   false),		  /* pcrel_offset */
+	   FALSE),		  /* pcrel_offset */
 
     /* GNU extension to record C++ vtable member usage */
     HOWTO (R_DLX_GNU_VTENTRY,     /* type */
 	   0,			  /* rightshift */
 	   2,			  /* size (0 = byte, 1 = short, 2 = long) */
 	   0,			  /* bitsize */
-	   false,		  /* pc_relative */
+	   FALSE,		  /* pc_relative */
 	   0,			  /* bitpos */
 	   complain_overflow_dont,/* complain_on_overflow */
 	   _bfd_elf_rel_vtable_reloc_fn,/* special_function */
 	   "R_DLX_GNU_VTENTRY",	  /* name */
-	   false,		  /* partial_inplace */
+	   FALSE,		  /* partial_inplace */
 	   0,			  /* src_mask */
 	   0,			  /* dst_mask */
-	   false)		  /* pcrel_offset */
+	   FALSE)		  /* pcrel_offset */
   };
 
 /* 16 bit offset for pc-relative branches.  */
@@ -168,15 +169,15 @@ HOWTO (R_DLX_RELOC_16_PCREL,  /* type */
        0,                     /* rightshift */
        1,                     /* size (0 = byte, 1 = short, 2 = long) */
        16,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_signed, /* complain_on_overflow */
        elf32_dlx_relocate16,  /* special_function */
        "R_DLX_RELOC_16_PCREL",/* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       true);                 /* pcrel_offset */
+       TRUE);                 /* pcrel_offset */
 
 /* 26 bit offset for pc-relative branches.  */
 static reloc_howto_type elf_dlx_gnu_rel26_s2 =
@@ -184,15 +185,15 @@ HOWTO (R_DLX_RELOC_26_PCREL,  /* type */
        0,                     /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        26,                    /* bitsize */
-       true,                  /* pc_relative */
+       TRUE,                  /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont,/* complain_on_overflow */
        elf32_dlx_relocate26,  /* special_function */
        "R_DLX_RELOC_26_PCREL",/* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       true);                 /* pcrel_offset */
+       TRUE);                 /* pcrel_offset */
 
 /* High 16 bits of symbol value.  */
 static reloc_howto_type elf_dlx_reloc_16_hi =
@@ -200,15 +201,15 @@ HOWTO (R_DLX_RELOC_16_HI,     /* type */
        16,                    /* rightshift */
        2,                     /* size (0 = byte, 1 = short, 2 = long) */
        32,                    /* bitsize */
-       false,                 /* pc_relative */
+       FALSE,                 /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont, /* complain_on_overflow */
        _bfd_dlx_elf_hi16_reloc,/* special_function */
        "R_DLX_RELOC_16_HI",   /* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xFFFF,                /* src_mask */
        0xffff,                /* dst_mask */
-       false);                /* pcrel_offset */
+       FALSE);                /* pcrel_offset */
 
   /* Low 16 bits of symbol value.  */
 static reloc_howto_type elf_dlx_reloc_16_lo =
@@ -216,15 +217,15 @@ HOWTO (R_DLX_RELOC_16_LO,     /* type */
        0,                     /* rightshift */
        1,                     /* size (0 = byte, 1 = short, 2 = long) */
        16,                    /* bitsize */
-       false,                 /* pc_relative */
+       FALSE,                 /* pc_relative */
        0,                     /* bitpos */
        complain_overflow_dont,/* complain_on_overflow */
        bfd_elf_generic_reloc, /* special_function */
        "R_DLX_RELOC_16_LO",   /* name */
-       true,                  /* partial_inplace */
+       TRUE,                  /* partial_inplace */
        0xffff,                /* src_mask */
        0xffff,                /* dst_mask */
-       false);                /* pcrel_offset */
+       FALSE);                /* pcrel_offset */
 
 
 /* The gas default beheaver is not to preform the %hi modifier so that the
@@ -519,7 +520,7 @@ static const struct elf_reloc_map dlx_reloc_map[] =
    Since we don't do .gots or .plts, we just need to consider the
    virtual table relocs for gc.  */
 
-static boolean
+static bfd_boolean
 elf32_dlx_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -532,7 +533,7 @@ elf32_dlx_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel_end;
 
   if (info->relocateable)
-    return true;
+    return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
@@ -558,19 +559,19 @@ elf32_dlx_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_DLX_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
+            return FALSE;
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_DLX_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
+            return FALSE;
           break;
         }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Given a BFD reloc type, return a howto structure.  */