Revert "Merge pull request numba#404 from stuartarchibald/wip/llvm7"

This reverts commit ebc4c59, reversing
changes made to a52ca0d.

README.rst

@@ -70,8 +70,7 @@ Historical compatibility table:
 =================  ========================
 llvmlite versions  compatible LLVM versions
 =================  ========================
-0.26.0 - ...       7.0.x
-0.23.0 - 0.25.0    6.0.x
+0.23.0 - ...       6.0.x
 0.21.0 - 0.22.0    5.0.x
 0.17.0 - 0.20.0    4.0.x
 0.16.0 - 0.17.0    3.9.x

buildscripts/incremental/setup_conda_environment.cmd

@@ -17,6 +17,6 @@ conda create -n %CONDA_ENV% -q -y python=%PYTHON% cmake
 
 call activate %CONDA_ENV%
 @rem Install llvmdev
-%CONDA_INSTALL% -c numba llvmdev="7.0*"
+%CONDA_INSTALL% -c numba llvmdev="6.0*"
 @rem Install enum34 for Python < 3.4
 if %PYTHON% LSS 3.4 (%CONDA_INSTALL% enum34)

buildscripts/incremental/setup_conda_environment.sh

@@ -25,7 +25,7 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-$CONDA_INSTALL -c numba llvmdev="7.0*"
+$CONDA_INSTALL -c numba llvmdev="6.0*"
 
 # Install the compiler toolchain, for osx, bootstrapping needed
 # which happens in build.sh

conda-recipes/0001-Transforms-Add-missing-header-for-InstructionCombini.patch

@@ -0,0 +1,31 @@
+From 7c9054610e354340f9474dcd13a927f929912d1d Mon Sep 17 00:00:00 2001
+From: Eugene Zelenko <[email protected]>
+Date: Tue, 6 Mar 2018 23:06:13 +0000
+Subject: [PATCH] [Transforms] Add missing header for InstructionCombining.cpp,
+ in order to export LLVMInitializeInstCombine as extern "C". Fixes PR35947.
+
+Patch by Brenton Bostick.
+
+Differential revision: https://reviews.llvm.org/D44140
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326843 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Transforms/InstCombine/InstructionCombining.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
+index a3b2fe9..7ec7343 100644
+--- a/lib/Transforms/InstCombine/InstructionCombining.cpp
++++ b/lib/Transforms/InstCombine/InstructionCombining.cpp
+@@ -34,6 +34,7 @@
+ //===----------------------------------------------------------------------===//
+
+ #include "InstCombineInternal.h"
++#include "llvm-c/Initialization.h"
+ #include "llvm/ADT/APInt.h"
+ #include "llvm/ADT/ArrayRef.h"
+ #include "llvm/ADT/DenseMap.h"
+-- 
+1.8.3.1
+