From e5acdfe3fdb4c02d88c5b98946827991055d890e Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sun, 26 Jul 2015 09:28:11 +0300
Subject: [PATCH] Update manual install instructions.

---
 doc/manual/installing.rst | 55 ++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
index dec7eab80..84243811e 100644
--- a/doc/manual/installing.rst
+++ b/doc/manual/installing.rst
@@ -99,31 +99,40 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
 .. note::
     The options ``develop`` and ``--user`` are for setup.py to install Migen in ``~/.local/lib/python3.4``.
 
-* Install OpenRISC GCC/binutils toolchain (or1k-elf-...): ::
+* Install OpenRISC binutils (or1k-linux-...): ::
 
         $ cd ~/artiq-dev
-        $ git clone https://github.com/openrisc/or1k-src
-        $ cd or1k-src
-        $ mkdir build
-        $ cd build
-        $ ../configure --target=or1k-elf --enable-shared --disable-itcl \
-                       --disable-tk --disable-tcl --disable-winsup \
-                       --disable-gdbtk --disable-libgui --disable-rda \
-                       --disable-sid --disable-sim --disable-gdb \
-                       --disable-newlib --disable-libgloss --disable-werror
+        $ wget https://ftp.gnu.org/gnu/binutils/binutils-2.25.1.tar.bz2
+        $ tar xvf binutils-2.25.1.tar.bz2
+        $ rm binutils-2.25.1.tar.bz2
+
+        $ mkdir binutils-2.25.1/build
+        $ cd binutils-2.25.1/build
+        $ ../configure --target=or1k-linux --prefix=/usr/local
         $ make -j4
         $ sudo make install
 
+.. note::
+    We're using an ``or1k-linux`` target because it is necessary to enable
+    shared library support in ``ld``, not because Linux is involved.
+
+* Install LLVM and Clang: ::
+
         $ cd ~/artiq-dev
-        $ git clone https://github.com/openrisc/or1k-gcc
-        $ cd or1k-gcc
+        $ git clone https://github.com/openrisc/llvm-or1k
+        $ cd llvm-or1k/tools
+        $ git clone https://github.com/openrisc/clang-or1k clang
+        $ cd ..
+
         $ mkdir build
         $ cd build
-        $ ../configure --target=or1k-elf --enable-languages=c \
-                       --disable-shared --disable-libssp
+        $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-or1k -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Rel -DLLVM_ENABLE_ASSERTIONS=ON
         $ make -j4
         $ sudo make install
 
+.. note::
+    Compilation of LLVM can take more than 30 min on some machines.
+
 .. _install-xc3sprog:
 
 * Install JTAG tools needed to program the Pipistrello and KC705:
@@ -181,6 +190,7 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
     ::
 
         $ cd ~/artiq-dev/misoc
+        $ export PATH=$PATH:/usr/local/llvm-or1k/bin
 
     * For Pipistrello::
 
@@ -279,19 +289,7 @@ To flash the ``idle`` kernel:
 Installing the host-side software
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* Install LLVM and the llvmlite Python bindings: ::
-
-        $ cd ~/artiq-dev
-        $ git clone https://github.com/openrisc/llvm-or1k
-        $ cd llvm-or1k/tools
-        $ git clone https://github.com/openrisc/clang-or1k clang
-
-        $ cd ..
-        $ mkdir build
-        $ cd build
-        $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/llvm-or1k -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Debug
-        $ make -j4
-        $ sudo make install
+* Install the llvmlite Python bindings: ::
 
         $ cd ~/artiq-dev
         $ git clone https://github.com/numba/llvmlite
@@ -304,9 +302,6 @@ Installing the host-side software
 .. note::
     llvmlite is in development and its API is not stable yet. Commit ID ``11a8303d02e3d6dd2d1e0e9065701795cd8a979f`` is known to work.
 
-.. note::
-    Compilation of LLVM can take more than 30 min on some machines.
-
 * Install ARTIQ: ::
 
         $ cd ~/artiq-dev