diff options
author | dvshkurko <dvshkurko@yandex-team.ru> | 2022-02-10 16:45:51 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:51 +0300 |
commit | 321ee9bce31ec6e238be26dbcbe539cffa2c3309 (patch) | |
tree | 14407a2757cbf29eb97e266b7f07e851f971000c /contrib/tools/yasm/modules/objfmts | |
parent | 2f6ca198245aeffd5e2d82b65927c2465b68b4f5 (diff) | |
download | ydb-321ee9bce31ec6e238be26dbcbe539cffa2c3309.tar.gz |
Restoring authorship annotation for <dvshkurko@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/tools/yasm/modules/objfmts')
-rw-r--r-- | contrib/tools/yasm/modules/objfmts/coff/coff-objfmt.c | 12 | ||||
-rw-r--r-- | contrib/tools/yasm/modules/objfmts/elf/elf-objfmt.c | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/contrib/tools/yasm/modules/objfmts/coff/coff-objfmt.c b/contrib/tools/yasm/modules/objfmts/coff/coff-objfmt.c index 388b09af32..9f7e76bd30 100644 --- a/contrib/tools/yasm/modules/objfmts/coff/coff-objfmt.c +++ b/contrib/tools/yasm/modules/objfmts/coff/coff-objfmt.c @@ -1192,13 +1192,13 @@ coff_objfmt_output(yasm_object *object, FILE *f, int all_syms, if (objfmt_coff->filesym_data->aux[0].fname) yasm_xfree(objfmt_coff->filesym_data->aux[0].fname); - if (!object->deb_filename) { - object->deb_filename = yasm_replace_path( - objfmt_coff->objfmt.module->replace_map, objfmt_coff->objfmt.module->replace_map_size, - object->src_filename, strlen(object->src_filename)); - } + if (!object->deb_filename) { + object->deb_filename = yasm_replace_path( + objfmt_coff->objfmt.module->replace_map, objfmt_coff->objfmt.module->replace_map_size, + object->src_filename, strlen(object->src_filename)); + } objfmt_coff->filesym_data->aux[0].fname = - yasm__xstrdup(object->deb_filename); + yasm__xstrdup(object->deb_filename); /* Force all syms for win64 because they're needed for relocations. * FIXME: Not *all* syms need to be output, only the ones needed for diff --git a/contrib/tools/yasm/modules/objfmts/elf/elf-objfmt.c b/contrib/tools/yasm/modules/objfmts/elf/elf-objfmt.c index 6874a1689f..20fc1dec0d 100644 --- a/contrib/tools/yasm/modules/objfmts/elf/elf-objfmt.c +++ b/contrib/tools/yasm/modules/objfmts/elf/elf-objfmt.c @@ -370,14 +370,14 @@ elf_objfmt_create_common(yasm_object *object, yasm_objfmt_module *module, /* FIXME: misuse of NULL bytecode here; it works, but only barely. */ filesym = yasm_symtab_define_label(object->symtab, ".file", NULL, 0, 0); - if (!object->deb_filename) { - object->deb_filename = yasm_replace_path( - module->replace_map, module->replace_map_size, - object->src_filename, strlen(object->src_filename)); - } + if (!object->deb_filename) { + object->deb_filename = yasm_replace_path( + module->replace_map, module->replace_map_size, + object->src_filename, strlen(object->src_filename)); + } /* Put in current input filename; we'll replace it in output() */ objfmt_elf->file_strtab_entry = - elf_strtab_append_str(objfmt_elf->strtab, object->deb_filename); + elf_strtab_append_str(objfmt_elf->strtab, object->deb_filename); entry = elf_symtab_entry_create(objfmt_elf->file_strtab_entry, filesym); yasm_symrec_add_data(filesym, &elf_symrec_data, entry); elf_symtab_set_nonzero(entry, NULL, SHN_ABS, STB_LOCAL, STT_FILE, NULL, @@ -758,14 +758,14 @@ elf_objfmt_output(yasm_object *object, FILE *f, int all_syms, info.f = f; info.GOT_sym = yasm_symtab_get(object->symtab, "_GLOBAL_OFFSET_TABLE_"); - if (!object->deb_filename) { - object->deb_filename = yasm_replace_path( - objfmt_elf->objfmt.module->replace_map, objfmt_elf->objfmt.module->replace_map_size, - object->src_filename, strlen(object->src_filename)); - } + if (!object->deb_filename) { + object->deb_filename = yasm_replace_path( + objfmt_elf->objfmt.module->replace_map, objfmt_elf->objfmt.module->replace_map_size, + object->src_filename, strlen(object->src_filename)); + } /* Update filename strtab */ elf_strtab_entry_set_str(objfmt_elf->file_strtab_entry, - object->deb_filename); + object->deb_filename); /* Allocate space for Ehdr by seeking forward */ if (fseek(f, (long)(elf_proghead_get_size()), SEEK_SET) < 0) { |