[llvm-commits] [llvm] r60679 - in /llvm/trunk: docs/GettingStarted.html docs/GettingStartedVS.html lib/Support/Annotation.cpp
Nick Lewycky
nicholas at mxc.ca
Sun Dec 7 16:45:04 PST 2008
Author: nicholas
Date: Sun Dec 7 18:45:02 2008
New Revision: 60679
URL: http://llvm.org/viewvc/llvm-project?rev=60679&view=rev
Log:
Fixes for Visual Studio users. Patch by OvermindDL1 on llvm-dev!
Modified:
llvm/trunk/docs/GettingStarted.html
llvm/trunk/docs/GettingStartedVS.html
llvm/trunk/lib/Support/Annotation.cpp
Modified: llvm/trunk/docs/GettingStarted.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.html?rev=60679&r1=60678&r2=60679&view=diff
==============================================================================
--- llvm/trunk/docs/GettingStarted.html (original)
+++ llvm/trunk/docs/GettingStarted.html Sun Dec 7 18:45:02 2008
@@ -268,7 +268,7 @@
<tr>
<td>Windows</td>
<td>x86<sup><a href="#pf_1">1</a></sup></td>
- <td>Visual Studio .NET<sup><a href="#pf_4">4</a>,<a href="#pf_5">5</a></sup></td>
+ <td>Visual Studio 2005 SP1 or higher<sup><a href="#pf_4">4</a>,<a href="#pf_5">5</a></sup></td>
<tr>
<td>AIX<sup><a href="#pf_3">3</a>,<a href="#pf_4">4</a></sup></td>
<td>PowerPC</td>
@@ -305,7 +305,7 @@
up</a></li>
<li><a name="pf_2">Code generation supported for 32-bit ABI only</a></li>
<li><a name="pf_3">No native code generation</a></li>
-<li><a name="pf_4">Build is not complete: one or more tools don't link</a></li>
+<li><a name="pf_4">Build is not complete: one or more tools do not link or function</a></li>
<li><a name="pf_5">The GCC-based C/C++ frontend does not build</a></li>
<li><a name="pf_6">The port is done using the MSYS shell.</a>
<a href="http://www.mingw.org/MinGWiki/">Download</a> and install
Modified: llvm/trunk/docs/GettingStartedVS.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStartedVS.html?rev=60679&r1=60678&r2=60679&view=diff
==============================================================================
--- llvm/trunk/docs/GettingStartedVS.html (original)
+++ llvm/trunk/docs/GettingStartedVS.html Sun Dec 7 18:45:02 2008
@@ -65,12 +65,12 @@
<p>The LLVM test suite cannot be run on the Visual Studio port at this
time.</p>
- <p>Most of the tools build and work. <tt>llvm-db</tt> does not build at this
- time. <tt>bugpoint</tt> does build, but does not work.
+ <p>Most of the tools build and work. <tt>bugpoint</tt> does build, but does
+ not work. The other tools 'should' work, but have not been fully tested.</p>
<p>Additional information about the LLVM directory structure and tool chain
can be found on the main <a href="GettingStarted.html">Getting Started</a>
- page.</P>
+ page.</p>
</div>
@@ -108,11 +108,38 @@
<li><tt>cd llvm</tt></li>
</ol></li>
</ul></li>
+
+ <li> Use <a href="http://www.cmake.org/">CMake</a> to generate up-to-date
+ project files:
+ <ul><li>This step is currently optional as LLVM does still come with a
+ normal Visual Studio solution file, but it is not always kept up-to-date
+ and will soon be deprecated in favor of the multi-platform generator
+ CMake.</li>
+ <li>If CMake is installed then the most simple way is to just start the
+ CMake GUI, select the directory where you have LLVM extracted to, and
+ the default options should all be fine. The one option you may really
+ want to change, regardless of anything else, might be the
+ CMAKE_INSTALL_PREFIX setting to select a directory to INSTALL to once
+ compiling is complete.</li>
+ <li>If you use CMake to generate the Visual Studio solution and project
+ files, then the Solution will have a few extra options compared to the
+ current included one. The projects may still be built individually, but
+ to build them all do not just select all of them in batch build (as some
+ are meant as configuration projects), but rather select and build just
+ the ALL_BUILD project to build everything, or the INSTALL project, which
+ first builds the ALL_BUILD project, then installs the LLVM headers, libs,
+ and other useful things to the directory set by the CMAKE_INSTALL_PREFIX
+ setting when you first configured CMake.</li>
+ </ul>
+ </li>
<li>Start Visual Studio
- <ol>
- <li>Simply double click on the solution file <tt>llvm/win32/llvm.sln</tt>.
- </li>
+ <ul>
+ <li>If you did not use CMake, then simply double click on the solution
+ file <tt>llvm/win32/llvm.sln</tt>.</li>
+ <li>If you used CMake, then the directory you created the project files,
+ the root directory will have an <tt>llvm.sln</tt> file, just
+ double-click on that to open Visual Studio.</li>
</ol></li>
<li>Build the LLVM Suite:
@@ -151,8 +178,8 @@
<div class="doc_text">
- <p>Any system that can adequately run Visual Studio .NET 2003 is fine. The
- LLVM source tree and object files, libraries and executables will consume
+ <p>Any system that can adequately run Visual Studio .NET 2005 SP1 is fine.
+ The LLVM source tree and object files, libraries and executables will consume
approximately 3GB.</p>
</div>
@@ -161,11 +188,15 @@
<div class="doc_subsection"><a name="software"><b>Software</b></a></div>
<div class="doc_text">
- <p>You will need Visual Studio .NET 2003. Earlier versions cannot open the
- solution/project files. The VS 2005 beta can, but will migrate these files
- to its own format in the process. While it should work with the VS 2005
- beta, there are no guarantees and there is no support for it at this time.
- It has been reported that VC++ Express also works.</p>
+ <p>You will need Visual Studio .NET 2005 SP1 or higher. The VS2005 SP1
+ beta and the normal VS2005 still have bugs that are not completely
+ compatible. VS2003 would work except (at last check) it has a bug with
+ friend classes that you can work-around with some minor code rewriting
+ (and please submit a patch if you do). Earlier versions of Visual Studio
+ do not support the C++ standard well enough and will not work.</p>
+
+ <p>You will also need the <a href="http://www.cmake.org/">CMake</a> build
+ system since it generates the project files you will use to build with.</p>
<p>If you plan to modify any .y or .l files, you will need to have bison
and/or flex installed where Visual Studio can find them. Otherwise, you do
Modified: llvm/trunk/lib/Support/Annotation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Annotation.cpp?rev=60679&r1=60678&r2=60679&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Annotation.cpp (original)
+++ llvm/trunk/lib/Support/Annotation.cpp Sun Dec 7 18:45:02 2008
@@ -31,7 +31,7 @@
namespace {
class StrCmp {
public:
- bool operator()(const char *a, const char *b) {
+ bool operator()(const char *a, const char *b) const {
return strcmp(a, b) < 0;
}
};
More information about the llvm-commits
mailing list