From: Nick Clifton <nickc@redhat.com>
Date: Wed, 25 Sep 2019 13:34:23 +0000 (+0100)
Subject: Silence a build-time warning about constant comparisons when building with clang,
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ba2ed48c8cb591c1ccac172be7f895f59080cfa;p=binutils-gdb.git

Silence a build-time warning about constant comparisons when building with clang,

 * emultempl/avrelf.em (_before_allocation): Silence build warning
 using clang.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0e550d21c23..d38c8614c9b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-25  Nick Clifton  <nickc@redhat.com>
+
+	* emultempl/avrelf.em (_before_allocation): Silence build warning
+	using clang.
+
 2019-09-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-plugin/pr24406-1.c (main): Correct buffer size
diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
index f3d1082287d..48675efc227 100644
--- a/ld/emultempl/avrelf.em
+++ b/ld/emultempl/avrelf.em
@@ -77,10 +77,10 @@ avr_elf_${EMULATION_NAME}_before_allocation (void)
       return;
     }
 
-  /* We only need stubs for avr6, avrxmega6, and avrxmega7. */
-  if (strcmp ("${EMULATION_NAME}","avr6")
-      && strcmp ("${EMULATION_NAME}","avrxmega6")
-      && strcmp ("${EMULATION_NAME}","avrxmega7") )
+  /* We only need stubs for avr6, avrxmega6, and avrxmega7.  */
+  if (strcmp ("${EMULATION_NAME}", "avr6") != 0
+      && strcmp ("${EMULATION_NAME}", "avrxmega6") != 0
+      && strcmp ("${EMULATION_NAME}", "avrxmega7") != 0)
     avr_no_stubs = TRUE;
 
   avr_elf_set_global_bfd_parameters ();