summaryrefslogtreecommitdiff
path: root/output/outelf64.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-20 15:20:16 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-20 15:20:16 -0700
commitcfb7176ca211d2bdc8c790c1b49e6f29db42f777 (patch)
tree5c8749b99df0ac2a1b508d2e2e52248e3a170dc0 /output/outelf64.c
parent76cbaa4b2e433ed78031dc75ae1b3183867c55ab (diff)
downloadnasm-cfb7176ca211d2bdc8c790c1b49e6f29db42f777.tar.gz
nasm-cfb7176ca211d2bdc8c790c1b49e6f29db42f777.tar.bz2
nasm-cfb7176ca211d2bdc8c790c1b49e6f29db42f777.zip
Move the output format macros into the macros.pl mechanism
Move the handling of "extra" macros (i.e. output format macros) into the macros.pl mechanism. This allows us to change the format of the internal macro store in the future - e.g. to a single byte store without redundant pointers. Also, stop using indicies into a long array when there is no good reason to not just use different arrays.
Diffstat (limited to 'output/outelf64.c')
-rw-r--r--output/outelf64.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/output/outelf64.c b/output/outelf64.c
index 9393e7a..3980cda 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -1511,16 +1511,8 @@ static void elf_filename(char *inname, char *outname, efunc error)
standard_extension(inname, outname, ".o", error);
}
-static const char *elf_stdmac[] = {
- "%define __SECT__ [section .text]",
- "%macro __NASM_CDecl__ 1",
- "%define $_%1 $%1",
- "%endmacro",
- "%macro osabi 1+.nolist",
- "[osabi %1]",
- "%endmacro",
- NULL
-};
+extern macros_t elf_stdmac[];
+
static int elf_set_info(enum geninfo type, char **val)
{
(void)type;