AArch64/opcodes: Correct an `index' global shadowing error

[deliverable/binutils-gdb.git] / opcodes / nds32-asm.c

diff --git a/opcodes/nds32-asm.c b/opcodes/nds32-asm.c
index 9a6329120600277b28caf224db14320c89fbb213..43aa661b60d335a3c22e53f40bdc6a0cca8e9b2d 100644 (file)
--- a/opcodes/nds32-asm.c
+++ b/opcodes/nds32-asm.c
@@ -1,5 +1,5 @@
 /* NDS32-specific support for 32-bit ELF.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
    Contributed by Andes Technology Corporation.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -2086,7 +2086,7 @@ done:
     {
       /* Sign-ext the value.  */
       if (((value >> 32) == 0) && (value & 0x80000000))
-       value |= (int64_t) -1 << 31;
+       value |= (int64_t) -1U << 31;
 
 
       /* Shift the value to positive domain.  */
@@ -2270,7 +2270,8 @@ retry_dot:
   pinsn->opcode = opc;
   if (opc == NULL)
     {
-      pdesc->result = NASM_ERR_SYNTAX;
+      if (pdesc->result == NASM_OK)
+       pdesc->result = NASM_ERR_SYNTAX;
       goto out;
     }