diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-09 09:39:08 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-09 09:39:08 -0700 |
| commit | 70395680812646994a52908ea377ad999f00eef8 (patch) | |
| tree | df7086b0293f9dadd7d705d2e8ea285a1dfa2093 | |
| parent | 080fbb135ff5624f9f95a186a8e2b2d8955710d8 (diff) | |
| parent | c357381da4b63eb50f5e133066fb72838b4b6ddf (diff) | |
| download | nasm-70395680812646994a52908ea377ad999f00eef8.tar.gz | |
Merge branch 'master' into macho64
Conflicts:
output/outmacho.mac
| -rw-r--r-- | output/outcoff.mac | 2 | ||||
| -rw-r--r-- | output/outmacho.mac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/output/outcoff.mac b/output/outcoff.mac index c9ecb54c..fffb1051 100644 --- a/output/outcoff.mac +++ b/output/outcoff.mac @@ -1,4 +1,4 @@ -OUT: coff +OUT: coff win32 win64 %define __SECT__ [section .text] %macro __NASM_CDecl__ 1 %endmacro diff --git a/output/outmacho.mac b/output/outmacho.mac index bef343d2..92c14bed 100644 --- a/output/outmacho.mac +++ b/output/outmacho.mac @@ -1,4 +1,4 @@ -OUT: macho macho32 macho64 win32 win64 +OUT: macho macho32 macho64 %define __SECT__ [section .text] %macro __NASM_CDecl__ 1 %endmacro
\ No newline at end of file |