VisualStudio project files updated. #include <algorithm> added to make VisualStudio...

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

diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp
index 884f4fce9196c1564edc3dd768a6f08e011fa70b..3d356b78aeea4fb7478e3d6ffb60f1e3bb40f0c9 100644 (file)
--- a/lib/Transforms/Utils/LowerInvoke.cpp
+++ b/lib/Transforms/Utils/LowerInvoke.cpp
@@ -143,7 +143,22 @@ bool LowerInvoke::doInitialization(Module &M) {
                                       Constant::getNullValue(PtrJBList),
                                       "llvm.sjljeh.jblist", &M);
     }
+
+// VisualStudio defines setjmp as _setjmp via #include <csetjmp> / <setjmp.h>, 
+// so it looks like Intrinsic::_setjmp
+#if defined(_MSC_VER) && defined(setjmp)
+#define setjmp_undefined_for_visual_studio
+#undef setjmp
+#endif
+
     SetJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::setjmp);
+
+#if defined(_MSC_VER) && defined(setjmp_undefined_for_visual_studio)
+// let's return it to _setjmp state in case anyone ever needs it after this 
+// point under VisualStudio
+#define setjmp _setjmp 
+#endif
+
     LongJmpFn = Intrinsic::getDeclaration(&M, Intrinsic::longjmp);
   }
 

diff --git a/utils/TableGen/RegisterInfoEmitter.cpp b/utils/TableGen/RegisterInfoEmitter.cpp
index ce95390054f8aa27550d2265ce90c7f75672a5ff..b9253cfd3e84e408227a29e6361d265ae65fcca7 100644 (file)
--- a/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/utils/TableGen/RegisterInfoEmitter.cpp
@@ -21,6 +21,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Streams.h"
 #include <set>
+#include <algorithm>
 using namespace llvm;
 
 // runEnums - Print out enum values for all of the registers.

diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index 2decde367d56758ec3ffaf6b93332ce93f7cf89f..56de59e54dad4f382f608e9ec72f5e121d8e3b20 100644 (file)
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -487,6 +487,10 @@
                                        RelativePath="..\..\lib\Transforms\Scalar\LoopUnswitch.cpp"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\..\lib\Transforms\Scalar\MemCpyOptimizer.cpp"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\..\lib\Transforms\Scalar\PredicateSimplifier.cpp"
                                        >