diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-15 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-15 00:05:07 -0400 |
| commit | b210797a6ada5816a56cacb0b4106a5bf525314c (patch) | |
| tree | f6a19e82285b78c105f7a7a05338a1e07eb65966 /build/make | |
| parent | 23c4cbdfbae53661877d449072241651b788d016 (diff) | |
| parent | 8c48c943e7c082b4330061e74ce85547253de301 (diff) | |
| download | libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar.gz libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.tar.bz2 libvpx-b210797a6ada5816a56cacb0b4106a5bf525314c.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'build/make')
| -rw-r--r-- | build/make/obj_int_extract.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/build/make/obj_int_extract.c b/build/make/obj_int_extract.c index 01b3129d7..c46d9d58b 100644 --- a/build/make/obj_int_extract.c +++ b/build/make/obj_int_extract.c @@ -918,15 +918,23 @@ int parse_coff(unsigned __int8 *buf, size_t sz) char name[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; strncpy(name, ptr, 8); //log_msg("COFF: Parsing symbol %s\n",name); - /* +1 to avoid printing leading underscore */ - printf("%-40s EQU ", name + 1); + /* The 64bit Windows compiler doesn't prefix with an _. + * Check what's there, and bump if necessary + */ + if (name[0] == '_') + printf("%-40s EQU ", name + 1); + else + printf("%-40s EQU ", name); } else { //log_msg("COFF: Parsing symbol %s\n", // buf + strtab_ptr + get_le32(ptr+4)); - /* +1 to avoid printing leading underscore */ - printf("%-40s EQU ", buf + strtab_ptr + get_le32(ptr + 4) + 1); + if ((buf + strtab_ptr + get_le32(ptr + 4))[0] == '_') + printf("%-40s EQU ", + buf + strtab_ptr + get_le32(ptr + 4) + 1); + else + printf("%-40s EQU ", buf + strtab_ptr + get_le32(ptr + 4)); } if (!(strcmp(sectionlist[section-1], ".bss"))) |