From: Alan Modra <amodra@gmail.com>
Date: Wed, 4 Feb 2015 22:44:56 +0000 (+1030)
Subject: Fix msp430 build with gcc-5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64a81db054a44e5539c4de5103125f3587de6403;p=binutils-gdb.git

Fix msp430 build with gcc-5

gcc-5 correctly complains "loop exit may only be reached after
undefined behavior".  I was going to correct this by checking the
index before dereferencing the array rather than the other way around,
but then I noticed it is possible for extract_cmd to write the
terminating zero one past the end of "cmd".  Fixing that means no
index check is needed in md_assemble.

	* config/tc-msp430.c (md_assemble): Correct size passed to
	extract_cmd.  Remove index check.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f216b8498c0..f354c229ed0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-05  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-msp430.c (md_assemble): Correct size passed to
+	extract_cmd.  Remove index check.
+
 2015-02-04  Matthew Wahab  <matthew.wahab@arm.com>
 
 	* config/tc-aarch64.c (aarch64_cpus): Add support for Cortex-A72.
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index e44e7b2602b..2891c13277e 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -3174,9 +3174,9 @@ md_assemble (char * str)
   unsigned int i = 0;
 
   str = skip_space (str);	/* Skip leading spaces.  */
-  str = extract_cmd (str, cmd, sizeof (cmd));
+  str = extract_cmd (str, cmd, sizeof (cmd) - 1);
 
-  while (cmd[i] && i < sizeof (cmd))
+  while (cmd[i])
     {
       char a = TOLOWER (cmd[i]);
       cmd[i] = a;