Merge branch 'master' of github.com:m-labs/artiq

artiq/test/py2llvm.py

@@ -4,6 +4,7 @@ import inspect
 from fractions import Fraction
 from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
 import struct
+import os
 
 import llvmlite_artiq.binding as llvm
 
@@ -16,7 +17,7 @@ from artiq.py2llvm.module import Module
 llvm.initialize()
 llvm.initialize_native_target()
 llvm.initialize_native_asmprinter()
-if struct.calcsize("P") < 8:
+if struct.calcsize("P") < 8 and os.name != "nt":
     from ctypes import _dlopen, RTLD_GLOBAL
     _dlopen("libgcc_s.so", RTLD_GLOBAL)
 

conda/llvmdev-or1k/bld.bat

@@ -9,7 +9,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
 )
 set CMAKE_GENERATOR_TOOLSET=v120_xp
 @rem Reduce build times and package size by removing unused stuff
-set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD=OR1K -DLLVM_INCLUDE_TESTS=OFF ^
+set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DLLVM_INCLUDE_TESTS=OFF ^
 -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF ^
 -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF ^
 -DLLVM_ENABLE_ASSERTIONS=ON

conda/llvmlite-artiq/meta.yaml

@@ -15,7 +15,7 @@ requirements:
         - python
 
 build:
-    number: 2
+    number: 3
 
 test:
     imports:

doc/manual/installing.rst

@@ -15,7 +15,11 @@ Installing Anaconda or Miniconda
 
 * You can either install Anaconda (chose Python 3.4) from https://store.continuum.io/cshop/anaconda/
 
-* Or install the more minimalistic Miniconda (chose Python3.4) from http://conda.pydata.org/miniconda.html
+* Or install the more minimalistic Miniconda (chose Python 3.4) from http://conda.pydata.org/miniconda.html
+
+.. warning::
+    If you are installing on Windows, chose the Windows 32-bit version regardless of whether you have
+    a 32-bit or 64-bit Windows.
 
 After installing either Anaconda or Miniconda, open a new terminal and make sure the following command works::