mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-30 16:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always remove a stale list file

Browse Source 
Remove the list file before running the first pass, so in case we
die before running pass 2 then there won't be a stale list file
sitting around.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-04-02 19:10:26 -07:00
parent 8f62246560
commit aac01ff479
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asm/nasm.c
View File

@ -1207,6 +1207,9 @@ static void assemble_file(char *fname, StrList **depend_ptr)
cpu = cmd_cpu; cpu = cmd_cpu;
if (pass0 == 2) { if (pass0 == 2) {
lfmt->init(listname); lfmt->init(listname);
} else if (passn == 1 && *listname) {
/* Remove the list file in case we die before the output pass */
remove(listname);
} }
in_absolute = false; in_absolute = false;
global_offset_changed = 0; /* set by redefine_label */ global_offset_changed = 0; /* set by redefine_label */

24
test/Makefile
View File

@ -10,40 +10,40 @@ $(NASM):
$(MAKE) -C .. $(MAKE) -C ..
%.bin: %.asm $(NASM) %.bin: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
%.ith: %.asm $(NASM) %.ith: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f ith -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f ith -o $@ -l $*.lst $<
%.srec: %.asm $(NASM) %.srec: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f srec -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f srec -o $@ -l $*.lst $<
%.o: %.asm $(NASM) %.o: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f elf32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf32 -o $@ -l $*.lst $<
%.o64: %.asm $(NASM) %.o64: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f elf64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f elf64 -o $@ -l $*.lst $<
%.obj: %.asm $(NASM) %.obj: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f obj -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f obj -o $@ -l $*.lst $<
%.coff: %.asm $(NASM) %.coff: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f coff -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f coff -o $@ -l $*.lst $<
%.win32: %.asm $(NASM) %.win32: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f win32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f win32 -o $@ -l $*.lst $<
%.win64: %.asm $(NASM) %.win64: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f win64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f win64 -o $@ -l $*.lst $<
%.mo32: %.asm $(NASM) %.mo32: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f macho32 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f macho32 -o $@ -l $*.lst $<
%.mo64: %.asm $(NASM) %.mo64: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f macho64 -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f macho64 -o $@ -l $*.lst $<
%.dbg: %.asm $(NASM) %.dbg: %.asm $(NASM)
$(RM) $*.lst ; $(NASM) $(NASMOPT) -f dbg -o $@ -l $*.lst $< $(NASM) $(NASMOPT) -f dbg -o $@ -l $*.lst $<
%.asm: %.pl %.asm: %.pl
$(PERL) $< > $@ $(PERL) $< > $@