diff options
| author | scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-09-03 16:27:39 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-09-03 16:27:39 +0000 |
| commit | 6b5f1af666c0fad6e4282d07267ff5ae84e7df9d (patch) | |
| tree | 2bf915d5a656f2d5c245ef0ba6f165146e84a2d8 | |
| parent | f164a228f51c17ffc3ed69516a7dc6abdf2d2c8e (diff) | |
| download | patched-yasm-6b5f1af666c0fad6e4282d07267ff5ae84e7df9d.tar.gz | |
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
| -rw-r--r-- | modules/arch/x86/x86id.c | 2 | ||||
| -rw-r--r-- | modules/objfmts/elf/elf.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ x86_find_match(x86_id_insn *id_insn, yasm_insn_operand **ops, 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)) 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_set_arch(yasm_arch *arch, yasm_symtab *symtab, int bits_pref) 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]); } } |