diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-04-10 17:37:11 +0300 |
---|---|---|
committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-04-24 20:02:41 +0300 |
commit | 4670887c4db772d2d44889fbc4509b3fb65b311f (patch) | |
tree | a01ef9ab8799afe9df844a03a75f708726b0bb6d /Mkfiles | |
parent | 855ec5aa2c4e68394234587e16b9c1191350295a (diff) | |
download | nasm-4670887c4db772d2d44889fbc4509b3fb65b311f.tar.gz |
out: Elf -- Merge Elf32, Elfx32 and Elf64 into single file
There is a bunch of common code here so merge them all into one file.
Unmergable parts are wrapped with is_elf() helpers.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'Mkfiles')
-rw-r--r-- | Mkfiles/msvc.mak | 16 | ||||
-rw-r--r-- | Mkfiles/netware.mak | 16 | ||||
-rw-r--r-- | Mkfiles/openwcom.mak | 19 | ||||
-rw-r--r-- | Mkfiles/owlinux.mak | 16 |
4 files changed, 8 insertions, 59 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index ecd6c4b2..52a0d59e 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -57,8 +57,7 @@ NASM = nasm.$(O) \ output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \ output/nullout.$(O) \ output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \ - output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ - output/outelfx32.$(O) \ + output/outelf.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ output/codeview.$(O) \ @@ -325,18 +324,7 @@ output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \ output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \ nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \ tables.h -output/outelf.$(O): output/outelf.c compiler.h directiv.h insnsi.h nasm.h \ - nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h output/outelf.h \ - output/outform.h pptok.h preproc.h rbtree.h regs.h saa.h tables.h -output/outelf32.$(O): output/outelf32.c compiler.h directiv.h eval.h \ - insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ - preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h -output/outelf64.$(O): output/outelf64.c compiler.h directiv.h eval.h \ - insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ - preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h -output/outelfx32.$(O): output/outelfx32.c compiler.h directiv.h eval.h \ +output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h \ insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak index 45728a2f..7cf5cc39 100644 --- a/Mkfiles/netware.mak +++ b/Mkfiles/netware.mak @@ -38,8 +38,7 @@ NASM = nasm.o \ outform.o outlib.o nulldbg.o \ nullout.o \ outbin.o outaout.o outcoff.o \ - outelf.o outelf32.o outelf64.o \ - outelfx32.o \ + outelf.o \ outobj.o outas86.o outrdf2.o \ outdbg.o outieee.o outmacho.o \ codeview.o \ @@ -209,21 +208,10 @@ outcoff.o: outcoff.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ raa.h regs.h saa.h tables.h outdbg.o: outdbg.c compiler.h config.h directiv.h insnsi.h nasm.h nasmint.h \ nasmlib.h opflags.h outform.h pptok.h preproc.h regs.h tables.h -outelf.o: outelf.c compiler.h config.h directiv.h insnsi.h nasm.h nasmint.h \ - nasmlib.h opflags.h dwarf.h elf.h outelf.h outform.h pptok.h preproc.h \ - rbtree.h regs.h saa.h tables.h -outelf32.o: outelf32.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ +outelf.o: outelf.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ nasmint.h nasmlib.h opflags.h dwarf.h elf.h outelf.h outform.h outlib.h \ stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h \ ver.h -outelf64.o: outelf64.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \ - nasmint.h nasmlib.h opflags.h dwarf.h elf.h outelf.h outform.h outlib.h \ - stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h \ - ver.h -outelfx32.o: outelfx32.c compiler.h config.h directiv.h eval.h insnsi.h \ - nasm.h nasmint.h nasmlib.h opflags.h dwarf.h elf.h outelf.h outform.h \ - outlib.h stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h \ - tables.h ver.h outform.o: outform.c compiler.h config.h directiv.h insnsi.h nasm.h \ nasmint.h nasmlib.h opflags.h outform.h pptok.h preproc.h regs.h tables.h outieee.o: outieee.c compiler.h config.h directiv.h insnsi.h nasm.h \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 4382536c..9eda33e6 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -54,8 +54,7 @@ NASM = nasm.$(O) & output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) & output/nullout.$(O) & output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) & - output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) & - output/outelfx32.$(O) & + output/outelf.$(O) & output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) & output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) & output/codeview.$(O) & @@ -353,21 +352,7 @@ output/outcoff.$(O): output/outcoff.c compiler.h config.h directiv.h eval.h & output/outdbg.$(O): output/outdbg.c compiler.h config.h directiv.h insnsi.h & nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h & regs.h tables.h -output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h insnsi.h & - nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h & - output/outelf.h output/outform.h pptok.h preproc.h rbtree.h regs.h saa.h & - tables.h -output/outelf32.$(O): output/outelf32.c compiler.h config.h directiv.h & - eval.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h & - output/elf.h output/outelf.h output/outform.h output/outlib.h & - output/stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h & - tables.h ver.h -output/outelf64.$(O): output/outelf64.c compiler.h config.h directiv.h & - eval.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h & - output/elf.h output/outelf.h output/outform.h output/outlib.h & - output/stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h & - tables.h ver.h -output/outelfx32.$(O): output/outelfx32.c compiler.h config.h directiv.h & +output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h & eval.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h & output/elf.h output/outelf.h output/outform.h output/outlib.h & output/stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h & diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak index 39494814..312812e1 100644 --- a/Mkfiles/owlinux.mak +++ b/Mkfiles/owlinux.mak @@ -65,8 +65,7 @@ NASM = nasm.$(O) \ output/outform.$(O) output/outlib.$(O) output/nulldbg.$(O) \ output/nullout.$(O) \ output/outbin.$(O) output/outaout.$(O) output/outcoff.$(O) \ - output/outelf.$(O) output/outelf32.$(O) output/outelf64.$(O) \ - output/outelfx32.$(O) \ + output/outelf.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ output/codeview.$(O) \ @@ -317,18 +316,7 @@ output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \ output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \ nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \ tables.h -output/outelf.$(O): output/outelf.c compiler.h directiv.h insnsi.h nasm.h \ - nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h output/outelf.h \ - output/outform.h pptok.h preproc.h rbtree.h regs.h saa.h tables.h -output/outelf32.$(O): output/outelf32.c compiler.h directiv.h eval.h \ - insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ - preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h -output/outelf64.$(O): output/outelf64.c compiler.h directiv.h eval.h \ - insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ - preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h -output/outelfx32.$(O): output/outelfx32.c compiler.h directiv.h eval.h \ +output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h \ insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \ preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h |