Fix miscellaneous Visual Studio build problems.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23307 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/TableGen/DAGISelEmitter.h b/utils/TableGen/DAGISelEmitter.h
index 9c84843519d81df72768c5c16fe5a42b99891b04..ecca505266c872dc711a02d3da6839aa975a4af4 100644 (file)
--- a/utils/TableGen/DAGISelEmitter.h
+++ b/utils/TableGen/DAGISelEmitter.h
@@ -19,7 +19,7 @@
 
 namespace llvm {
   class Record;
-  class Init;
+  struct Init;
   class DagInit;
   class SDNodeInfo;
   class TreePattern;

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index da8cbaa9b7296a3e0ace84561c3b56ccb33c100f..c03b8fdb4615600903a3a8381c715f688b608a61 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -132,6 +132,9 @@
                        <File
                                RelativePath="..\..\utils\TableGen\CodeGenTarget.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\DAGISelEmitter.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\FileLexer.l">
                                <FileConfiguration
@@ -214,6 +217,9 @@ move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                        <File
                                RelativePath="..\..\utils\TableGen\CodeGenTarget.h">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\DAGISelEmitter.h">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h">
                        </File>

diff --git a/win32/llvm.sln b/win32/llvm.sln
index 7885e4602f8ea0ab3333651575f1c08d4e2e2229..eb0687f825abe5fde2a69d7c46f1a713f0f72a96 100644 (file)
--- a/win32/llvm.sln
+++ b/win32/llvm.sln
@@ -76,6 +76,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lli", "lli\lli.vcproj", "{F
                {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508}
                {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61}
                {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}
+               {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}
                {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
                {76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A}
                {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}
@@ -93,6 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llc", "llc\llc.vcproj", "{A
                {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508}
                {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61}
                {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}
+               {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897} = {08CEB1BB-C2A4-4587-B9A9-AEDB8FB44897}
                {057777CD-DED5-46DF-BF9A-6B76DE212549} = {057777CD-DED5-46DF-BF9A-6B76DE212549}
                {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
                {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}