Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/Mkfiles/Makefile.flat

-# $Id: Makefile.flat 2183 2009-03-24 04:58:46Z peter $
+# $Id: Makefile.flat 2284 2010-02-06 09:27:32Z peter $
 #
 # Ultra-flat Makefile "prototype" for non-Unix platforms.
 # Does NOT depend on or use configure.
 #
 # Works for simple build but *not* for development (no clean, dist, etc).
 # Also, WARNING, no header dependencies are included!
 #
 # NOTE: Needs a valid config.h for the platform being compiled on.
 #
 # This file should be customized to particular platforms by changing CC and
 #  CFLAGS appropriately, along with writing a config.h and _stdint.h for the
 #  platform and placing them in a subdirectory of Mkfiles.
 
 CFLAGS=-DHAVE_CONFIG_H -IMkfiles -I.
 CC?=gcc
 BUILDCC?=$(CC)
 
-all: yasm ytasm
+all: yasm ytasm vsyasm
 
 LIBYASM_OBJS= \
  libyasm/assocdat.o \
  libyasm/bitvect.o \
  libyasm/bc-align.o \
  libyasm/bc-data.o \
  libyasm/bc-incbin.o \
  libyasm/bc-org.o \
  libyasm/bc-reserve.o \
  libyasm/bytecode.o \
@@ skipping 75 matching lines @@
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_macho objfmt_macho32 objfmt_macho64
 YASM_MODULES+=objfmt_rdf
 YASM_MODULES+=objfmt_xdf
 
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
  modules/parsers/nasm/nasm-parse.o \
  nasm-token.o \
  modules/parsers/gas/gas-parser.o \
+ modules/parsers/gas/gas-parse-intel.o \
  modules/parsers/gas/gas-parse.o \
  gas-token.o
 YASM_MODULES+=parser_nasm parser_tasm
 YASM_MODULES+=parser_gas parser_gnu
 
 MODULES_PREPROCS_NASM_OBJS= \
  modules/preprocs/nasm/nasm-eval.o \
  modules/preprocs/nasm/nasm-pp.o \
  modules/preprocs/nasm/nasm-preproc.o \
  modules/preprocs/nasm/nasmlib.o
 YASM_MODULES+=preproc_nasm preproc_tasm
 
 MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o
 YASM_MODULES+=preproc_raw
 
 MODULES_PREPROCS_CPP_OBJS = \
  modules/preprocs/cpp/cpp-preproc.o
 YASM_MODULES+=preproc_cpp
 
+MODULES_PREPROCS_GAS_OBJS = \
+ modules/preprocs/gas/gas-eval.o \
+ modules/preprocs/gas/gas-preproc.o
+YASM_MODULES+=preproc_gas
+
 MODULES_PREPROCS_OBJS = \
  $(MODULES_PREPROCS_NASM_OBJS) \
  $(MODULES_PREPROCS_RAW_OBJS) \
- $(MODULES_PREPROCS_CPP_OBJS)
+ $(MODULES_PREPROCS_CPP_OBJS) \
+ $(MODULES_PREPROCS_GAS_OBJS)
 
 MODULES_OBJS = \
  $(MODULES_ARCH_OBJS) \
  $(MODULES_DBGFMTS_OBJS) \
  $(MODULES_LISTFMTS_OBJS) \
  $(MODULES_OBJFMTS_OBJS) \
  $(MODULES_OPTIMIZERS_OBJS) \
  $(MODULES_PARSERS_OBJS) \
  $(MODULES_PREPROCS_OBJS)
 
 YASM_OBJS= \
  frontends/yasm/yasm.o \
  frontends/yasm/yasm-options.o \
  $(LIBYASM_OBJS) \
  $(MODULES_OBJS)
 
 YTASM_OBJS= \
  frontends/tasm/tasm.o \
  frontends/tasm/tasm-options.o \
  $(LIBYASM_OBJS) \
  $(MODULES_OBJS)
 
+VSYASM_OBJS= \
+ frontends/vsyasm/vsyasm.o \
+ frontends/yasm/yasm-options.o \
+ $(LIBYASM_OBJS) \
+ $(MODULES_OBJS)
+
 genstring: genstring.c
         $(BUILDCC) -o $@ $<
 
 license.c: COPYING genstring
         ./genstring license_msg $@ COPYING
 
 frontends/yasm/yasm.c: license.c
 
 genmacro: tools/genmacro/genmacro.c
         $(BUILDCC) -o $@ $<
@@ skipping 77 matching lines @@
 
 genperf: $(GENPERF_SRCS)
         $(BUILDCC) -I. -o genperf $(GENPERF_SRCS)
 
 yasm: $(YASM_OBJS)
         $(CC) -o yasm $(YASM_OBJS)
 
 ytasm: $(YTASM_OBJS)
         $(CC) -o ytasm $(YTASM_OBJS)
 
+vsyasm: $(VSYASM_OBJS)
+        $(CC) -o vsyasm $(VSYASM_OBJS)
+
 .c.o:
         $(CC) -c $(CFLAGS) -o $@ $<