=haul in master (something went wrong in rebase?)

base/sysimg.jl

@@ -4,7 +4,19 @@ baremodule Base
 
 using Core.Intrinsics
 ccall(:jl_set_istopmod, Void, (Bool,), true)
-include = Core.include
+function include(path::AbstractString)
+    local result
+    if INCLUDE_STATE === 1
+        result = Core.include(path)
+    elseif INCLUDE_STATE === 2
+        result = _include(path)
+    elseif INCLUDE_STATE === 3
+        result = include_from_node1(path)
+    end
+    result
+end
+INCLUDE_STATE = 1 # include = Core.include
+
 include("coreio.jl")
 
 eval(x) = Core.eval(Base,x)
@@ -67,9 +79,9 @@ end
 Symbol(x...) = Symbol(string(x...))
 
 # array structures
+include("array.jl")
 include("abstractarray.jl")
 include("subarray.jl")
-include("array.jl")
 
 # Array convenience converting constructors
 (::Type{Array{T}}){T}(m::Integer) = Array{T,1}(Int(m))
@@ -101,7 +113,6 @@ include("multinverses.jl")
 using .MultiplicativeInverses
 include("abstractarraymath.jl")
 include("arraymath.jl")
-include("float16.jl")
 
 # SIMD loops
 include("simdloop.jl")
@@ -201,14 +212,15 @@ include("permuteddimsarray.jl")
 using .PermutedDimsArrays
 
 let SOURCE_PATH = ""
-    global include = function(path)
+    global function _include(path)
         prev = SOURCE_PATH
         path = joinpath(dirname(prev),path)
         SOURCE_PATH = path
         Core.include(path)
         SOURCE_PATH = prev
     end
 end
+INCLUDE_STATE = 2 # include = _include (from lines above)
 
 # reduction along dims
 include("reducedim.jl")  # macros in this file relies on string.jl
@@ -371,7 +383,7 @@ function __init__()
     init_threadcall()
 end
 
-include = include_from_node1
+INCLUDE_STATE = 3 # include = include_from_node1
 include("precompile.jl")
 
 end # baremodule Base