Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision f1607a4397bf5dd9c2f797b4a476effbf36eb00f)
+++ general/prog/llvm.xml	(revision 7e16699bd1bc1b6a5e74a94f0ce8c96ea0b32085)
@@ -7,14 +7,15 @@
   <!ENTITY llvm-download-http "http://llvm.org/releases/&llvm-version;/llvm-&llvm-version;.src.tar.gz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "46ed668a1ce38985120dbf6344cf6116">
-  <!ENTITY llvm-size          "16 MB">
-  <!ENTITY llvm-buildsize     "519 MB (1.1 GB with Clang)">
-  <!ENTITY llvm-time          "11.4 SBU and 0.4 for tests (22.7 SBU with Clang)">
-
-  <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/clang-&llvm-version;.src.tar.gz">
-  <!ENTITY clang-md5sum        "b378f1e2c424e03289effc75268d3d2c">
+  <!ENTITY llvm-md5sum        "b90697f4de35563ad6c35924defa8dd1">
+  <!ENTITY llvm-size          "15 MB">
+  <!ENTITY llvm-buildsize     "624 MB (1.2 GB with Clang)">
+  <!ENTITY llvm-time          "17.1 SBU (33 SBU with Clang) and 0.4 for tests">
+
+  <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/cfe-&llvm-version;.src.tar.gz">
+  <!ENTITY clang-md5sum        "c64fdc567383211c9ac212d6f7b69263">
   <!ENTITY clang-size          "11 MB">
 
-  <!ENTITY compiler-rt-download-http "http://llvm.org/releases/&llvm-version;/compiler-rt-&llvm-version;.src.tar.gz">
+  <!ENTITY rt-version                "3.4">
+  <!ENTITY compiler-rt-download-http "http://llvm.org/releases/&rt-version;/compiler-rt-&rt-version;.src.tar.gz">
   <!ENTITY compiler-rt-md5sum        "7938353e3a3bda85733a165e7ac4bb84">
   <!ENTITY compiler-rt-size          "1.8 MB">
@@ -162,9 +163,9 @@
     </para>
 
-<screen><userinput>tar -xf ../clang-&llvm-version;.src.tar.gz -C tools &amp;&amp;
-tar -xf ../compiler-rt-&llvm-version;.src.tar.gz -C projects &amp;&amp;
-
-mv tools/clang-&llvm-version; tools/clang &amp;&amp;
-mv projects/compiler-rt-&llvm-version; projects/compiler-rt</userinput></screen>
+<screen><userinput>tar -xf ../cfe-&llvm-version;.src.tar.gz -C tools &amp;&amp;
+tar -xf ../compiler-rt-&rt-version;.src.tar.gz -C projects &amp;&amp;
+
+mv tools/cfe-&llvm-version;.src tools/clang &amp;&amp;
+mv projects/compiler-rt-&rt-version; projects/compiler-rt</userinput></screen>
 
     <para>
@@ -173,6 +174,7 @@
     </para>
 
-<screen><userinput>sed -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm-&llvm-version;:' \
+<screen><userinput>sed -e 's:/docs/llvm:/share/doc/llvm-&llvm-version;:' \
     -i Makefile.config.in &amp;&amp;
+
 CC=gcc CXX=g++                         \
 ./configure --prefix=/usr              \
@@ -183,9 +185,4 @@
             --disable-assertions       &amp;&amp;
 make</userinput></screen>
-<!--            -disable-expensive-checks &amp;&amp; default -->
-<!--            -disable-debug-runtime    \ default -->
-<!--            -enable-targets=all       \ default -->
-<!--            -enable-experimental-targets=R600 &amp;&amp;
-it is default, now, not anymore experimental-->
 
     <para>
@@ -205,4 +202,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 for file in /usr/lib/lib{clang,LLVM,LTO}*.a
 do
@@ -264,9 +262,4 @@
       single library.
     </para>
-<!--
-    <para>
-      <parameter>-enable-targets=all</parameter>: This switch ensures
-      that all <application>LLVM</application> targets are built.
-    </para>-->
 
     <para>
@@ -274,13 +267,4 @@
       not necessary on a production system.
     </para>
-<!--
-    <para>
-      <parameter>-enable-experimental-targets=R600</parameter>:
-      This switch enables R600 target which is required by
-      <application>Mesa</application> to build the radeonsi
-      3D driver. It can be used for R600
-      <application>LLVM</application> backend and OpenCL
-      state tracker in <application>Mesa</application>.
-    </para>-->
 
   </sect2>
@@ -296,10 +280,12 @@
       <seglistitem>
         <seg>
-          bugpoint, c-index-test, clang, clang++ (symlink), clang-check, clang-format, clang-tblgen,
-          llc, lli, lli-child-target, llvm-ar, llvm-as, llvm-bcanalyzer, llvm-config, llvm-cov, llvm-diff,
-          llvm-dis, llvm-dwarfdump, llvm-extract, llvm-link, llvm-mc, llvm-mcmarkup,
-          llvm-nm, llvm-objdump,<!-- llvm-prof,--> llvm-ranlib (symlink), llvm-readobj, llvm-rtdyld,
-          llvm-size, llvm-stress, llvm-symbolizer, llvm-tblgen, macho-dump, opt, 
-          scan-build (symlink) and scan-view (symlink)
+          bugpoint, c-index-test, clang, clang++ (symlink), clang-check,
+          clang-format, clang-tblgen, llc, lli, lli-child-target, llvm-ar,
+          llvm-as, llvm-bcanalyzer, llvm-config, llvm-cov, llvm-diff, llvm-dis,
+          llvm-dwarfdump, llvm-extract, llvm-link, llvm-mc, llvm-mcmarkup,
+          llvm-nm, llvm-objdump,<!-- llvm-prof,--> llvm-ranlib (symlink),
+          llvm-readobj, llvm-rtdyld, llvm-size, llvm-stress, llvm-symbolizer,
+          llvm-tblgen, macho-dump, opt, scan-build (symlink) and scan-view
+          (symlink)
         </seg>
         <seg>
