From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed, 6 Apr 2011 15:12:17 +0000 (+0400)
Subject: Merge branch 'nasm-2.09.xx'
X-Git-Tag: nasm-2.11.05~431
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4f98b3aabcd202d9aedb72f86c4f40fd0102871;p=platform%2Fupstream%2Fnasm.git

Merge branch 'nasm-2.09.xx'

Conflicts:
	nasm.h
	version

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

a4f98b3aabcd202d9aedb72f86c4f40fd0102871
diff --cc doc/changes.src
index 302e9d1,7195377..a3ba18c
--- a/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