4 files changed, 4 insertions, 4 deletions
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 3442c95..0260b7a 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1538,7 +1538,7 @@ fragment <<EOF
     }
 
   if (link_info.eh_frame_hdr_type == COMPACT_EH_HDR)
-    if (bfd_elf_parse_eh_frame_entries (NULL, &link_info) == FALSE)
+    if (!bfd_elf_parse_eh_frame_entries (NULL, &link_info))
       einfo (_("%P%F: Failed to parse EH frame entries.\n"));
 }
 
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index e835404..16d28e2 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -379,7 +379,7 @@ typedef struct
    underscore.  */
 #define GET_INIT_SYMBOL_NAME(IDX) \
   (init[(IDX)].symbol \
-  + ((init[(IDX)].is_c_symbol == FALSE || (is_underscoring () != 0)) ? 0 : 1))
+   + ((!init[(IDX)].is_c_symbol || is_underscoring () != 0) ? 0 : 1))
 
 /* Decorates the C visible symbol by underscore, if target requires.  */
 #define U(CSTR) \
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 59812ce..420ffa8 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -350,7 +350,7 @@ typedef struct
 
 #define GET_INIT_SYMBOL_NAME(IDX) \
   (init[(IDX)].symbol \
-  + ((init[(IDX)].is_c_symbol == FALSE || (is_underscoring () == 1)) ? 0 : 1))
+   + ((!init[(IDX)].is_c_symbol || is_underscoring () == 1) ? 0 : 1))
 
 /* Decorates the C visible symbol by underscore, if target requires.  */
 #define U(CSTR) \
diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
index 080b66d..1447d52 100644
--- a/ld/emultempl/xtensaelf.em
+++ b/ld/emultempl/xtensaelf.em
@@ -1432,7 +1432,7 @@ xtensa_wild_group_interleave_callback (lang_statement_union_type *statement)
 	  struct wildcard_list *l;
 	  for (l = w->section_list; l != NULL; l = l->next)
 	    {
-	      if (l->spec.sorted == TRUE)
+	      if (l->spec.sorted != none)
 		{
 		  no_reorder = TRUE;
 		  break;