summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-12-10 15:35:50 -0800
committerH. Peter Anvin <hpa@zytor.com>2007-12-10 15:35:50 -0800
commit65746dfecd8091e998b02055e3baa23bd0b0be37 (patch)
treec8b2c85cbf314623380d2439e62815ba40a041c9
parente55c836b5af387054cfb921f2554a1bc8657d91f (diff)
parent116994111be03210b47ab50bd533adb5fa9cf9be (diff)
downloadnasm-65746dfecd8091e998b02055e3baa23bd0b0be37.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/nasm
-rw-r--r--output/outelf32.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/output/outelf32.c b/output/outelf32.c
index ab56eb77..33fe1b98 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -230,6 +230,8 @@ static int32_t elf_sym_sect;
static void elf_init(FILE * fp, efunc errfunc, ldfunc ldef, evalfunc eval)
{
+ if (of_elf.current_dfmt != &null_debug_form)
+ of_elf32.current_dfmt = of_elf.current_dfmt;
elffp = fp;
error = errfunc;
evaluate = eval;