Merge https://github.com/yasm/yasm/commit/9728322335cba96500861ef766b1546d096e5600

aka https://github.com/yasm/yasm/pull/64 from upstream.

TBR=thakis@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10914069

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/yasm/patched-yasm@154697 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

modules/arch/x86/x86id.c

diff --git a/modules/arch/x86/x86id.c b/modules/arch/x86/x86id.c
index e635704..e73cc8c 100644
--- a/modules/arch/x86/x86id.c
+++ b/modules/arch/x86/x86id.c
@@ -608,7 +608,7 @@
         unsigned int misc_flags = info->misc_flags;
         unsigned int size;
         int mismatch = 0;
-        int i;
+        unsigned int i;
 
         /* Match CPU */
         if (mode_bits != 64 && (misc_flags & ONLY_64))

modules/objfmts/elf/elf.c

diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c
index 4c1ebc8..e0b28a1 100644
--- a/modules/objfmts/elf/elf.c
+++ b/modules/objfmts/elf/elf.c
@@ -99,7 +99,7 @@
                                                     elf_march->ssyms[i].name,
                                                     NULL, 0, 0);
             yasm_symrec_add_data(elf_ssyms[i], &elf_ssym_symrec_data,
-                                 &elf_march->ssyms[i]);
+                                 (void*)&elf_march->ssyms[i]);
         }
     }