diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-04-24 11:14:43 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-04-24 11:14:43 -0700 |
| commit | 9bb55bd1276822565f111f0bb347024b7e08df5b (patch) | |
| tree | 4582a8ab5ea1dbbe5fc60484fc9518a426b29797 /macros | |
| parent | 982186a1a3139763f2aa2710b32236009f64270d (diff) | |
| parent | 8b262474424c0f6912b22bbf7452f26bfa4d1235 (diff) | |
| download | nasm-9bb55bd1276822565f111f0bb347024b7e08df5b.tar.gz | |
Merge branch 'evalmacro'
Resolved Conflicts:
asm/preproc.c
output/elf.h
output/outelf.c
output/outelf.h
version
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/standard.mac | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/macros/standard.mac b/macros/standard.mac index fa543f4e..32197b02 100644 --- a/macros/standard.mac +++ b/macros/standard.mac @@ -49,12 +49,6 @@ STD: nasm ; here, not all of them are: the user-level form of a format-specific ; directive should be defined in the module for that directive. -; These three need to be defined, though the actual definitions will -; be constantly updated during preprocessing. -%define __FILE__ -%define __LINE__ -%define __BITS__ - %define __SECT__ ; it ought to be defined, even if as nothing %imacro section 1+.nolist |