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 /Mkfiles | |
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 'Mkfiles')
-rw-r--r-- | Mkfiles/msvc.mak | 12 | ||||
-rw-r--r-- | Mkfiles/netware.mak | 11 | ||||
-rw-r--r-- | Mkfiles/openwcom.mak | 12 | ||||
-rw-r--r-- | Mkfiles/owlinux.mak | 12 |
4 files changed, 15 insertions, 32 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index f7d78b3c..b220a0da 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -55,8 +55,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) \ @@ -320,12 +319,9 @@ output/outieee.$(O): output/outieee.c compiler.h directiv.h insnsi.h nasm.h \ regs.h tables.h output/outlib.$(O): output/outlib.c compiler.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 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 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 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 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 diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 68741ba4..66e1115a 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -42,8 +42,7 @@ NASM = nasm.o nasmlib.o ver.o \ outelf.o outelf32.o outelf64.o \ outelfx32.o \ outobj.o outas86.o outrdf2.o \ - outdbg.o outieee.o outmac32.o \ - outmac64.o \ + outdbg.o outieee.o outmac.o \ md5c.o codeview.o \ preproc.o quote.o pptok.o \ macros.o listing.o eval.o exprlib.o stdscan.o \ @@ -224,12 +223,8 @@ outieee.o: outieee.c compiler.h config.h directiv.h insnsi.h nasm.h \ nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h regs.h tables.h outlib.o: outlib.c compiler.h config.h directiv.h insnsi.h nasm.h nasmlib.h \ opflags.h outlib.h pptok.h preproc.h regs.h tables.h -outmac32.o: outmac32.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ - nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h \ - tables.h -outmac64.o: outmac64.c compiler.h config.h directiv.h insnsi.h nasm.h \ - nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h \ - tables.h +outmac.o: outmac.c compiler.h config.h directiv.h insnsi.h nasm.h nasmlib.h \ + opflags.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h tables.h outobj.o: outobj.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h regs.h stdscan.h \ tables.h diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 91a7d2f5..c673c471 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -58,8 +58,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) & @@ -371,12 +370,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 diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index a7d0d185..2a6f899e 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -69,8 +69,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) \ @@ -334,12 +333,9 @@ output/outieee.$(O): output/outieee.c compiler.h directiv.h insnsi.h nasm.h \ regs.h tables.h output/outlib.$(O): output/outlib.c compiler.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 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 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 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 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 |