]> granicus.if.org Git - yasm/commitdiff
Merge [1966] - [1970] (inclusive) and [1972] from trunk.
authorPeter Johnson <peter@tortall.net>
Fri, 21 Sep 2007 16:59:14 +0000 (16:59 -0000)
committerPeter Johnson <peter@tortall.net>
Fri, 21 Sep 2007 16:59:14 +0000 (16:59 -0000)
These commits add the cpp preproc module, written by Paul Barker.

svn path=/branches/yasm-0.6.x/; revision=1978

1  2 
Mkfiles/Makefile.dj
Mkfiles/Makefile.flat
Mkfiles/dj/config.h
Mkfiles/vc/config.h
Mkfiles/vc8/config.h
configure.ac
modules/parsers/nasm/nasm-parser.h
po/POTFILES.in

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc po/POTFILES.in
index 4dc46a984a878c547ae4a2b8049b686d71a4bddb,34438fa87ee9da4668078cabc7193c762f3b6c9d..0eb3eb595f78d723f56ea980583d9b1df7b895d4
@@@ -23,10 -22,11 +22,11 @@@ libyasm/insn.
  libyasm/intnum.c
  libyasm/section.c
  libyasm/symrec.c
+ libyasm/valparam.c
  libyasm/value.c
  libyasm/xmalloc.c
 -modules/arch/lc3b/lc3barch.c
 -modules/arch/lc3b/lc3bbc.c
 +#modules/arch/lc3b/lc3barch.c
 +#modules/arch/lc3b/lc3bbc.c
  modules/arch/x86/x86arch.c
  modules/arch/x86/x86bc.c
  modules/arch/x86/x86expr.c
@@@ -54,5 -54,8 +54,7 @@@ modules/parsers/gas/gas-parser.
  modules/parsers/gas/gas-token.re
  modules/parsers/nasm/nasm-parse.c
  modules/parsers/nasm/nasm-token.re
 -modules/preprocs/yapp/yapp-preproc.c
+ modules/preprocs/cpp/cpp-preproc.c
+ modules/preprocs/nasm/nasm-preproc.c
  modules/preprocs/nasm/nasm-pp.c
  modules/preprocs/raw/raw-preproc.c