diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2010-01-01 15:16:52 +0300 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2010-01-03 15:04:36 +0300 |
| commit | 126faf2e3b59ec80b1f9e0e23bbfa2bc3619c562 (patch) | |
| tree | e0abcf7f89e70bc666dc4a086ed40a2498b83d8c | |
| parent | d1428b23da921cf0feed7d5a0c6ca8fd903950e7 (diff) | |
| download | nasm-126faf2e3b59ec80b1f9e0e23bbfa2bc3619c562.tar.gz | |
output/outelfX.c: Use definitions from stabs.h
Also made Makefile.in to handle dependency.
There are some makefiles in Mkfiles\ should
be fixed as well.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | output/outelf.h | 5 | ||||
| -rw-r--r-- | output/outelf32.c | 1 | ||||
| -rw-r--r-- | output/outelf64.c | 8 |
4 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 060d830f..21e193b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -322,12 +322,12 @@ output/outelf.$(O): output/outelf.c compiler.h config.h directives.h \ output/outelf.h output/outform.h pptok.h preproc.h regs.h output/outelf32.$(O): output/outelf32.c compiler.h config.h directives.h \ eval.h insnsi.h nasm.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \ - rbtree.h regs.h saa.h stdscan.h + output/outelf.h output/outform.h output/stabs.h output/outlib.h pptok.h \ + preproc.h raa.h rbtree.h regs.h saa.h stdscan.h output/outelf64.$(O): output/outelf64.c compiler.h config.h directives.h \ eval.h insnsi.h nasm.h nasmlib.h opflags.h output/dwarf.h output/elf.h \ - output/outelf.h output/outform.h output/outlib.h pptok.h preproc.h raa.h \ - rbtree.h regs.h saa.h stdscan.h + output/outelf.h output/outform.h output/stabs.h output/outlib.h pptok.h \ + preproc.h raa.h rbtree.h regs.h saa.h stdscan.h output/outform.$(O): output/outform.c compiler.h config.h directives.h \ insnsi.h nasm.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h \ regs.h diff --git a/output/outelf.h b/output/outelf.h index d3f6d133..850f8fe2 100644 --- a/output/outelf.h +++ b/output/outelf.h @@ -45,11 +45,6 @@ #define SEG_ALIGN_1 (SEG_ALIGN-1) /* this stuff is needed for the stabs debugging format */ -#define N_SO 0x64 /* ID for main source file */ -#define N_SOL 0x84 /* ID for sub-source file */ -#define N_BINCL 0x82 -#define N_EINCL 0xA2 -#define N_SLINE 0x44 #define TY_STABSSYMLIN 0x40 /* ouch */ /* this stuff is needed for the dwarf debugging format */ diff --git a/output/outelf32.c b/output/outelf32.c index fba037ff..52fb91c2 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -55,6 +55,7 @@ #include "rbtree.h" #include "output/dwarf.h" +#include "output/stabs.h" #include "output/elf.h" #include "output/outelf.h" diff --git a/output/outelf64.c b/output/outelf64.c index 85b449d5..acd79d40 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -55,6 +55,7 @@ #include "rbtree.h" #include "output/dwarf.h" +#include "output/stabs.h" #include "output/elf.h" #include "output/outelf.h" @@ -142,13 +143,6 @@ static struct SAA *elf_build_symtab(int32_t *, int32_t *); static struct SAA *elf_build_reltab(uint64_t *, struct Reloc *); static void add_sectname(char *, char *); -/* type values for stabs debugging sections */ -#define N_SO 0x64 /* ID for main source file */ -#define N_SOL 0x84 /* ID for sub-source file */ -#define N_BINCL 0x82 /* not currently used */ -#define N_EINCL 0xA2 /* not currently used */ -#define N_SLINE 0x44 - struct stabentry { uint32_t n_strx; uint8_t n_type; |