diff options
author | H. Peter Anvin <hpa@zytor.com> | 2016-02-12 03:04:41 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2016-02-12 03:04:41 -0800 |
commit | c635497870ade8eb5c028e68278581879b04d52e (patch) | |
tree | dabc06b9d31d47adbd939bf00cd60c3d954be772 /Makefile.in | |
parent | d7043da28199f2a98c202a025c8bccf93329deb9 (diff) | |
download | nasm-c635497870ade8eb5c028e68278581879b04d52e.tar.gz |
Merge the macho32 and macho64 (outmac32/64) backends
Merge the two Mach-O backends for cleanliness and maintainability.
This should also make the recent fixes to MachO-64 available in
MachO-32.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index e788547f..ac5521a7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,8 +84,7 @@ NASM = nasm.$(O) nasmlib.$(O) ver.$(O) \ output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ output/outelfx32.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ - output/outdbg.$(O) output/outieee.$(O) output/outmac32.$(O) \ - output/outmac64.$(O) \ + output/outdbg.$(O) output/outieee.$(O) output/outmac.$(O) \ md5c.$(O) output/codeview.$(O) \ preproc.$(O) quote.$(O) pptok.$(O) \ macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \ @@ -404,12 +403,9 @@ output/outieee.$(O): output/outieee.c compiler.h config.h directiv.h \ output/outlib.$(O): output/outlib.c compiler.h config.h directiv.h insnsi.h \ nasm.h nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h \ tables.h -output/outmac32.$(O): output/outmac32.c compiler.h config.h directiv.h \ - eval.h insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h \ - pptok.h preproc.h raa.h regs.h saa.h tables.h -output/outmac64.$(O): output/outmac64.c compiler.h config.h directiv.h \ - insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h \ - pptok.h preproc.h raa.h regs.h saa.h tables.h +output/outmac.$(O): output/outmac.c compiler.h config.h directiv.h insnsi.h \ + nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \ + preproc.h raa.h regs.h saa.h tables.h output/outobj.$(O): output/outobj.c compiler.h config.h directiv.h eval.h \ insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h \ pptok.h preproc.h regs.h stdscan.h tables.h |