3 files changed, 43 insertions, 25 deletions
diff --git a/doc/building/llvm/GNULinux-GNAT.rst b/doc/building/llvm/GNULinux-GNAT.rst
index d72de34a2..b0f26b991 100644
--- a/doc/building/llvm/GNULinux-GNAT.rst
+++ b/doc/building/llvm/GNULinux-GNAT.rst
@@ -24,3 +24,15 @@ On Linux, GHDL is configured by ``configure`` and build by ``make``.
    ../configure --prefix=PREFIX
    make
    sudo make install
+
+
+.. TODO::
+   You need to install LLVM (usually depends on :samp:`libedit`, see :ghdlsharp`29`). The supported versions are 3.5 till 3.9, but debugging is only supported with LLVM 3.5.
+
+   - First configure GHDL with the proper arg :samp:`./configure --with-llvm-config`. If :samp:`llvm-config` is not in your path, you can specify it: :samp:`./configure --with-llvm-config=LLVM_INSTALL/bin/llvm-config`.
+   
+   .. HINT::
+      If you want to have stack backtraces on errors (like assert failure or index of out bounds), you need to configure and build :samp:`libbacktrace` from GCC (you don't need to configure GCC). Then add the following arg to configure: :samp:`--with-backtrace-lib=/path-to-gcc-build/libbacktrace/.libs/libbacktrace.a`
+   
+   - Then build with :samp:`make` and install with :samp:`make install`.
+
diff --git a/doc/building/llvm/Windows-MinGW-GNAT.rst b/doc/building/llvm/Windows-MinGW-GNAT.rst
new file mode 100644
index 000000000..1329b80a1
--- /dev/null
+++ b/doc/building/llvm/Windows-MinGW-GNAT.rst
@@ -0,0 +1,26 @@
+.. _BUILD:llvm:Windows-MinGW-GNAT:
+
+GHDL with LLVM backend build on Windows with GCC/GNAT (MinGW)
+#############################################################
+
+On Windows with MinGW, GHDL is configured by ``configure`` and build by ``make``.
+
+* First, GHDL needs to be configured. It is common to specify a ``PREFIX``
+  (installation directory like ``/usr/local`` or ``/opt/ghdl``). Without any
+  other option, ``configure`` select `mcode` as backend.
+
+* Next, ``make`` starts the compilation process.
+
+* Finally, ``make install`` installs GHDL into the installation directory
+  specified by ``PREFIX``.
+
+.. rubric:: Example:
+
+.. code-block:: Bash
+   
+   cd <ghdl>
+   mkdir build
+   cd build
+   ../configure --prefix=PREFIX
+   make
+   make install
diff --git a/doc/building/llvm/index.rst b/doc/building/llvm/index.rst
index a2faf9d74..4f60cd083 100644
--- a/doc/building/llvm/index.rst
+++ b/doc/building/llvm/index.rst
@@ -19,32 +19,12 @@ LLVM Backend
 
 .. rubric:: Supported platforms
 
-* :ref:`GNU/Linux with GCC <BUILD:mcode:GNULinux-GCC>`
-* :ref:`Windows (x86_64) with MinGW32/MinGW64 <BUILD:mcode:Windows-WinGW>`
+* :ref:`GNU/Linux with GCC <BUILD:llvm:GNULinux-GNAT>`
+* Mac OS
+* :ref:`Windows (x86_64) with MinGW32/MinGW64 <BUILD:llvm:Windows-WinGW-GNAT>`
 
 .. toctree::
    :hidden:
 
-   GNULinux-GNAT
-   Windows-WinGW
-
-	 
-	 
-GNU/Linux
----------
-
-You need to install LLVM (usually depends on :samp:`libedit`, see :ghdlsharp`29`). The supported versions are 3.5 till 3.9, but debugging is only supported with LLVM 3.5.
-
-- First configure GHDL with the proper arg :samp:`./configure --with-llvm-config`. If :samp:`llvm-config` is not in your path, you can specify it: :samp:`./configure --with-llvm-config=LLVM_INSTALL/bin/llvm-config`.
-
-.. HINT:: If you want to have stack backtraces on errors (like assert failure or index of out bounds), you need to configure and build :samp:`libbacktrace` from GCC (you don't need to configure GCC). Then add the following arg to configure: :samp:`--with-backtrace-lib=/path-to-gcc-build/libbacktrace/.libs/libbacktrace.a`
-
-- Then build with :samp:`make` and install with :samp:`make install`.
-  
-Mac OS?
--------
-
-Windows MinGW 32/64
--------------------
-	 
-	 
-\ No newline at end of file
+   GNU/Linux with GCC/GNAT <GNULinux-GNAT>
+   Windows with GCC/GNAT (MinGW) <Windows-MinGW-GNAT>