Merge branch 'nasm-2.09.xx'

Conflicts:
	nasm.h
	version

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

diff --cc doc/changes.src
index 302e9d1,7195377..a3ba18c
--- 1/doc/changes.src
--- 2/doc/changes.src
+++ b/doc/changes.src
@@@ -7,18 -7,16 +7,27 @@@
  The NASM 2 series support x86-64, and is the production version of NASM
  since 2007.
  
 +\S{cl-2.10} Version 2.10
 +
 +\b When optimization is enabled, \c{mov r64,imm} now optimizes to the
 +  shortest form possible between:
 +
 +\c      mov r32,imm32                   ;  5 bytes
 +\c      mov r64,imm32                   ;  7 bytes
 +\c      mov r64,imm64                   ; 10 bytes
 +
 +To force a specific form, use the \c{STRICT} keyword, see \k{strict}.
 +
  
+ \S{cl-2.09.08} Version 2.09.08
+ 
+ \b Fix \c{__OUTPUT_FORMAT__} assignment when output driver alias
+    is used. For example when \c{-f elf} is used \c{__OUTPUT_FORMAT__}
+    must be set to \c{elf}, if \c{-f elf32} is used \c{__OUTPUT_FORMAT__}
+    must be assigned accordingly, i.e. to \c{elf32}. The rule applies to
+    all output driver aliases. See \k{ofmtm}.
+ 
+ 
  \S{cl-2.09.07} Version 2.09.07
  
  \b Fix attempts to close same file several times

diff --cc doc/nasmdoc.src
Simple merge