diff options
author | Stanislav Karchebny <berkus@users.sourceforge.net> | 2003-09-25 11:28:45 +0000 |
---|---|---|
committer | Stanislav Karchebny <berkus@users.sourceforge.net> | 2003-09-25 11:28:45 +0000 |
commit | 5e8f36611f0d2543aa4f2cb5da02892b83c6994a (patch) | |
tree | e7d7d1627b0b65c3020bf54002d982aadfa14f48 | |
parent | 88a049aca1f4e1ce8a072d0f1757a4de1dfb0608 (diff) | |
download | nasm-5e8f36611f0d2543aa4f2cb5da02892b83c6994a.tar.gz |
Consistency fix
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | output/outaout.c | 2 | ||||
-rw-r--r-- | output/outas86.c | 2 | ||||
-rw-r--r-- | output/outbin.c | 2 | ||||
-rw-r--r-- | output/outcoff.c | 2 | ||||
-rw-r--r-- | output/outelf.c | 2 | ||||
-rw-r--r-- | output/outobj.c | 2 | ||||
-rw-r--r-- | output/outrdf.c | 2 | ||||
-rw-r--r-- | output/outrdf2.c | 2 | ||||
-rw-r--r-- | test/nasmformat.asm | 4 |
10 files changed, 11 insertions, 11 deletions
@@ -3,7 +3,7 @@ * "make spotless" no longer deletes config.h.in. * Unterminated string auto termination. * %(el)if(n)idn insensitivity to string quotes difference (#809300). -* _NASM_FORMAT_ now gives output format chosen for compiling. +* __NASM_FORMAT__ now gives output format chosen for compiling. See test/nasmformat.asm for details and output/out*.c for actual values for this macro. !!NEEDS DOCUMENTING!! diff --git a/output/outaout.c b/output/outaout.c index 495e9ac7..18746e37 100644 --- a/output/outaout.c +++ b/output/outaout.c @@ -877,7 +877,7 @@ static void aout_filename (char *inname, char *outname, efunc error) static const char *aout_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'aout'", + "%define __NASM_FORMAT__ 'aout'", "%macro __NASM_CDecl__ 1", "%endmacro", NULL diff --git a/output/outas86.c b/output/outas86.c index b623a15b..ccf87e7f 100644 --- a/output/outas86.c +++ b/output/outas86.c @@ -555,7 +555,7 @@ static void as86_filename (char *inname, char *outname, efunc error) static const char *as86_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'as86'", + "%define __NASM_FORMAT__ 'as86'", "%macro __NASM_CDecl__ 1", "%endmacro", NULL diff --git a/output/outbin.c b/output/outbin.c index 72821ffd..3f63d4ce 100644 --- a/output/outbin.c +++ b/output/outbin.c @@ -137,7 +137,7 @@ static char *infile, *outfile; static const char *bin_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'bin'", + "%define __NASM_FORMAT__ 'bin'", "%imacro org 1+.nolist", "[org %1]", "%endmacro", diff --git a/output/outcoff.c b/output/outcoff.c index 655e3fc0..bd0202f2 100644 --- a/output/outcoff.c +++ b/output/outcoff.c @@ -820,7 +820,7 @@ static void coff_win32_filename (char *inname, char *outname, efunc error) static const char *coff_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'coff'", + "%define __NASM_FORMAT__ 'coff'", "%macro __NASM_CDecl__ 1", "%endmacro", "%imacro export 1+.nolist", diff --git a/output/outelf.c b/output/outelf.c index 276feac0..bff9405d 100644 --- a/output/outelf.c +++ b/output/outelf.c @@ -1225,7 +1225,7 @@ static void elf_filename (char *inname, char *outname, efunc error) static const char *elf_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'elf'", + "%define __NASM_FORMAT__ 'elf'", "%macro __NASM_CDecl__ 1", "%define $_%1 $%1", "%endmacro", diff --git a/output/outobj.c b/output/outobj.c index 188ff73e..a3eed140 100644 --- a/output/outobj.c +++ b/output/outobj.c @@ -2285,7 +2285,7 @@ void obj_fwrite(ObjRecord *orp) static const char *obj_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'obj'", + "%define __NASM_FORMAT__ 'obj'", "%imacro group 1+.nolist", "[group %1]", "%endmacro", diff --git a/output/outrdf.c b/output/outrdf.c index 6ae492ea..32e63bca 100644 --- a/output/outrdf.c +++ b/output/outrdf.c @@ -501,7 +501,7 @@ static void rdf_filename (char *inname, char *outname, efunc error) { static char *rdf_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'oldrdf'", /* Its always oldrdf for consistency with rdf version 2 */ + "%define __NASM_FORMAT__ 'oldrdf'", /* Its always oldrdf for consistency with rdf version 2 */ "%imacro library 1+.nolist", "[library %1]", "%endmacro", diff --git a/output/outrdf2.c b/output/outrdf2.c index 8fdf6a44..3c69e0a3 100644 --- a/output/outrdf2.c +++ b/output/outrdf2.c @@ -753,7 +753,7 @@ static void rdf2_filename (char *inname, char *outname, efunc error) { static const char *rdf2_stdmac[] = { "%define __SECT__ [section .text]", - "%define _NASM_FORMAT_ 'rdf'", + "%define __NASM_FORMAT__ 'rdf'", "%imacro library 1+.nolist", "[library %1]", "%endmacro", diff --git a/test/nasmformat.asm b/test/nasmformat.asm index decf090e..82d61c15 100644 --- a/test/nasmformat.asm +++ b/test/nasmformat.asm @@ -1,9 +1,9 @@ -%if _NASM_FORMAT_ == 'bin' +%if __NASM_FORMAT__ == 'bin' db 'This is binary format file' -%elif _NASM_FORMAT_ == 'obj' +%elif __NASM_FORMAT__ == 'obj' db 'This is object format file' |