Merge remote-tracking branch 'origin/nasm-2.12.xx'
This commit is contained in:
commit
e93572e6be
4 changed files with 17 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
||||||
## --------------------------------------------------------------------------
|
## --------------------------------------------------------------------------
|
||||||
##
|
##
|
||||||
## Copyright 1996-2010 The NASM Authors - All Rights Reserved
|
## Copyright 1996-2016 The NASM Authors - All Rights Reserved
|
||||||
## See the file AUTHORS included with the NASM distribution for
|
## See the file AUTHORS included with the NASM distribution for
|
||||||
## the specific copyright holders.
|
## the specific copyright holders.
|
||||||
##
|
##
|
||||||
|
@ -78,6 +78,7 @@
|
||||||
%macro
|
%macro
|
||||||
%pathsearch
|
%pathsearch
|
||||||
%pop
|
%pop
|
||||||
|
%pragma
|
||||||
%push
|
%push
|
||||||
%rep
|
%rep
|
||||||
%repl
|
%repl
|
||||||
|
|
|
@ -2322,6 +2322,14 @@ static int do_directive(Token * tline)
|
||||||
tline->text);
|
tline->text);
|
||||||
return NO_DIRECTIVE_FOUND; /* didn't get it */
|
return NO_DIRECTIVE_FOUND; /* didn't get it */
|
||||||
|
|
||||||
|
case PP_PRAGMA:
|
||||||
|
/*
|
||||||
|
* Currently %pragma doesn't do anything; it is here for
|
||||||
|
* forward compatibility with future versions of NASM.
|
||||||
|
*/
|
||||||
|
free_tlist(origline);
|
||||||
|
return DIRECTIVE_FOUND;
|
||||||
|
|
||||||
case PP_STACKSIZE:
|
case PP_STACKSIZE:
|
||||||
/* Directive to tell NASM what the default stack size is. The
|
/* Directive to tell NASM what the default stack size is. The
|
||||||
* default is for a 16-bit stack, and this can be overriden with
|
* default is for a 16-bit stack, and this can be overriden with
|
||||||
|
|
|
@ -35,6 +35,10 @@ since 2007.
|
||||||
included in a shipping product; it is included for completeness
|
included in a shipping product; it is included for completeness
|
||||||
only.
|
only.
|
||||||
|
|
||||||
|
\b Add the \c{%pragma} preprocessor directive for forward
|
||||||
|
compatibility with future versions of NASM. At this time no pragmas
|
||||||
|
are implemented and this is merely a dummy directive.
|
||||||
|
|
||||||
\S{cl-2.12.02} Version 2.12.02
|
\S{cl-2.12.02} Version 2.12.02
|
||||||
|
|
||||||
\b Fix preprocessor errors, especially \c{%error} and \c{%warning},
|
\b Fix preprocessor errors, especially \c{%error} and \c{%warning},
|
||||||
|
|
|
@ -1398,7 +1398,9 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
write_output(outname);
|
write_output(outname);
|
||||||
|
|
||||||
if (errorcount > 0)
|
if (errorcount > 0) {
|
||||||
|
remove(outname);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue