Bring Mkfiles up to date with new optimizer and removal of lc3b.

svn path=/trunk/yasm/; revision=1603

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 30579cbb6601c807e44d918f08f84300542f3de5..5006a1beb532a4a8cfdf816113270217ddfcf5cb 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -54,15 +54,15 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86id.o
 YASM_MODULES=arch_x86
 
-MODULES_ARCH_LC3B_OBJS= \
- modules/arch/lc3b/lc3barch.o \
- modules/arch/lc3b/lc3bbc.o \
- lc3bid.o
-YASM_MODULES+=arch_lc3b
+#MODULES_ARCH_LC3B_OBJS= \
+# modules/arch/lc3b/lc3barch.o \
+# modules/arch/lc3b/lc3bbc.o \
+# lc3bid.o
+#YASM_MODULES+=arch_lc3b
 
 MODULES_ARCH_OBJS= \
  $(MODULES_ARCH_X86_OBJS) \
- $(MODULES_ARCH_LC3B_OBJS)
+# $(MODULES_ARCH_LC3B_OBJS)
 
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
@@ -97,10 +97,6 @@ YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 
-MODULES_OPTIMIZERS_OBJS= \
- modules/optimizers/basic/basic-optimizer.o
-YASM_MODULES+=optimizer_basic
-
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
  nasm-bison.o \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 662738553d3f73c84464e1cdd43b01a5dfe35c35..a0d32abf2b6c125775d3285891e376df7b35cccc 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -57,15 +57,15 @@ MODULES_ARCH_X86_OBJS= \
  modules/arch/x86/x86id.o
 YASM_MODULES=arch_x86
 
-MODULES_ARCH_LC3B_OBJS= \
- modules/arch/lc3b/lc3barch.o \
- modules/arch/lc3b/lc3bbc.o \
- lc3bid.o
-YASM_MODULES+=arch_lc3b
+#MODULES_ARCH_LC3B_OBJS= \
+# modules/arch/lc3b/lc3barch.o \
+# modules/arch/lc3b/lc3bbc.o \
+# lc3bid.o
+#YASM_MODULES+=arch_lc3b
 
 MODULES_ARCH_OBJS= \
  $(MODULES_ARCH_X86_OBJS) \
- $(MODULES_ARCH_LC3B_OBJS)
+# $(MODULES_ARCH_LC3B_OBJS)
 
 MODULES_DBGFMTS_OBJS= \
  modules/dbgfmts/null/null-dbgfmt.o \
@@ -100,10 +100,6 @@ YASM_MODULES+=objfmt_coff objfmt_win32 objfmt_win64 objfmt_x64
 YASM_MODULES+=objfmt_elf objfmt_elf32 objfmt_elf64
 YASM_MODULES+=objfmt_xdf
 
-MODULES_OPTIMIZERS_OBJS= \
- modules/optimizers/basic/basic-optimizer.o
-YASM_MODULES+=optimizer_basic
-
 MODULES_PARSERS_OBJS= \
  modules/parsers/nasm/nasm-parser.o \
  nasm-bison.o \

diff --git a/Mkfiles/vc/libyasm/libyasm.vcproj b/Mkfiles/vc/libyasm/libyasm.vcproj
index 9c899369ad85b86259ab7841df009a3c516670e0..47d849a5467d6bcdfa0bf22eb0fc4f0485ed72fa 100644 (file)
--- a/Mkfiles/vc/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc/libyasm/libyasm.vcproj
@@ -274,9 +274,6 @@
                        <File\r
                                RelativePath="..\..\..\libyasm\objfmt.h">\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\optimizer.h">\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\parser.h">\r
                        </File>\r

diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index e88295be579800f9e28dff12a5a91e987ae45a5c..b82cd442b8c45ac25e297ddfa1868e17f9db980b 100644 (file)
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -124,18 +124,6 @@
                        <Filter\r
                                Name="arch"\r
                                Filter="">\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\lc3bid.c">\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\..\modules\arch\x86\x86arch.c">\r
                                </File>\r
@@ -223,13 +211,6 @@
                                        RelativePath="..\..\..\modules\objfmts\xdf\xdf-objfmt.c">\r
                                </File>\r
                        </Filter>\r
-                       <Filter\r
-                               Name="optimizers"\r
-                               Filter="">\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\optimizers\basic\basic-optimizer.c">\r
-                               </File>\r
-                       </Filter>\r
                        <Filter\r
                                Name="parsers"\r
                                Filter="">\r

diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 8c47c7c175e1bca5a4ab5d31b30c2f2bcb40ecfa..efe9d9e3c6ab2dfd6cee5332636f7abf6db3058e 100644 (file)
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -526,10 +526,6 @@
                                RelativePath="..\..\..\libyasm\objfmt.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\..\libyasm\optimizer.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\..\libyasm\parser.h"\r
                                >\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 51ece1351e07e7663194f200eed532cd9ca022f3..4351a4f61e2565bd9f274d6054f3459b30439e11 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -327,22 +327,6 @@
                        <Filter\r
                                Name="arch"\r
                                >\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3barch.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\arch\lc3b\lc3bbc.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\..\lc3bid.c"\r
-                                       >\r
-                               </File>\r
                                <File\r
                                        RelativePath="..\..\..\modules\arch\x86\x86arch.c"\r
                                        >\r
@@ -456,14 +440,6 @@
                                        >\r
                                </File>\r
                        </Filter>\r
-                       <Filter\r
-                               Name="optimizers"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\..\..\modules\optimizers\basic\basic-optimizer.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
                        <Filter\r
                                Name="parsers"\r
                                >\r