Merge pull request #39530 from JuliaLang/backports-release-1.6

KristofferC · web-flow · commit d8f8b84d22be · 2021-02-05T13:18:44.000+01:00
Backports for 1.6rc1
diff --git a/base/reinterpretarray.jl b/base/reinterpretarray.jl
@@ -90,6 +90,9 @@ If `sizeof(T) = n*sizeof(S)` for `n>1`, `A`'s first dimension must be
 of size `n` and `B` lacks `A`'s first dimension. Conversely, if `sizeof(S) = n*sizeof(T)` for `n>1`,
 `B` gets a new first dimension of size `n`. The dimensionality is unchanged if `sizeof(T) == sizeof(S)`.
 
+!!! compat "Julia 1.6"
+    This method requires at least Julia 1.6.
+
 # Examples
 
 ```jldoctest
diff --git a/deps/checksums/openlibm b/deps/checksums/openlibm
@@ -1,34 +1,34 @@
-OpenLibm.v0.7.3+0.aarch64-apple-darwin.tar.gz/md5/952aa82f7f68d2194f7d11d4350ffd72
-OpenLibm.v0.7.3+0.aarch64-apple-darwin.tar.gz/sha512/21df2e0ef62ed0a8643da0a2e0433397c176b813cd65dad5edfc87949670cb5824c5885adc8d46356d85856ce6ce341c46e7b0ebb03cc196701d42412bbcd3e1
-OpenLibm.v0.7.3+0.aarch64-linux-gnu.tar.gz/md5/cacae0b3983eb8e826d81ce3075b70de
-OpenLibm.v0.7.3+0.aarch64-linux-gnu.tar.gz/sha512/14cb022e4830089f74c842fb24eb3109aec1fca69063dc6eaa1189f36e2f9f66549832372920d1b31f68e2a2ab2cc2da6b266f06bb3fe2bf726ae05f87e4bd82
-OpenLibm.v0.7.3+0.aarch64-linux-musl.tar.gz/md5/8573d2cb3449e027b4ccc26a8a4ec921
-OpenLibm.v0.7.3+0.aarch64-linux-musl.tar.gz/sha512/cc5ce6613ba3d91fc83ee063855e1866db6d294f9d3142097ad294848dc92965d5bc32194aea74850dd497ff10d3b61a1736cea0c26e99759940b72ea976b845
-OpenLibm.v0.7.3+0.armv6l-linux-gnueabihf.tar.gz/md5/4299ab7e86ac68fd808c738a75eeec09
-OpenLibm.v0.7.3+0.armv6l-linux-gnueabihf.tar.gz/sha512/498a136258b7a09af92d1c97b0cbd90e1a660b170506e430edf836b334cfecaedc5b1925eac449ab662ced36757a191caef116a3ca06616155554190b4186598
-OpenLibm.v0.7.3+0.armv6l-linux-musleabihf.tar.gz/md5/5b4ec47298490ca651ff68c1c8b18228
-OpenLibm.v0.7.3+0.armv6l-linux-musleabihf.tar.gz/sha512/1454bd5fb8b16f524681e452584abd4688a769e35403b86a106c52b7bd8f20dc3ee63e732b188a4e65f002b1dd547d26b5897864b4f384830e0d9f5203ba6c35
-OpenLibm.v0.7.3+0.armv7l-linux-gnueabihf.tar.gz/md5/4f9860af01bf463d95a8d5fefce9e0b2
-OpenLibm.v0.7.3+0.armv7l-linux-gnueabihf.tar.gz/sha512/4fc4d9ba0831ab149762afd09fe92315370bb80961261dc7680a54dce53e8c6114de90ae0e893512dd67cccf345ef3713d6ec9c2426f726ef0b1d95dbbb8e852
-OpenLibm.v0.7.3+0.armv7l-linux-musleabihf.tar.gz/md5/72c137dc71bdd8a39229c7df73090aed
-OpenLibm.v0.7.3+0.armv7l-linux-musleabihf.tar.gz/sha512/ac43b49865e9cc6fbc298e41e505a8c67c56ec89574540b30d48a8f84aa52d11318ea6d39e6437ee121e2d13efbdcd2ca683141f4e5fab169626e2872f80afe4
-OpenLibm.v0.7.3+0.i686-linux-gnu.tar.gz/md5/c4009c37047824c1ffee601d68dbe6a1
-OpenLibm.v0.7.3+0.i686-linux-gnu.tar.gz/sha512/4b98c3ad95ee9b571e99f9c014623af3441dcc092ad348ecdc9a5a6fa6b8951da159b33991680cf58126209615bbf47f02691c3c99927e2e236c09801368b6cf
-OpenLibm.v0.7.3+0.i686-linux-musl.tar.gz/md5/57100992a834cc72011db730d2565c84
-OpenLibm.v0.7.3+0.i686-linux-musl.tar.gz/sha512/28dd41f2b90239b432981734409a6834b06bd189e54fed4eeebf40c9264a392e4449110936192b2116b98aa3122b3896bdec7b8ad22bc4eaa5e12e4b2b231f1d
-OpenLibm.v0.7.3+0.i686-w64-mingw32.tar.gz/md5/655ba5c08eedf6f24fbbf992adbe9bb0
-OpenLibm.v0.7.3+0.i686-w64-mingw32.tar.gz/sha512/660b73e5426c44522a90a56b972ee2506810c808874407567e0f92dbc9bd5d04f4ca907738053e2cec92ee69ad63cf2471baf258e20b1369fe96b363f21b28ab
-OpenLibm.v0.7.3+0.powerpc64le-linux-gnu.tar.gz/md5/14c034d365382369ee40a47a8d9e75ec
-OpenLibm.v0.7.3+0.powerpc64le-linux-gnu.tar.gz/sha512/4d08990885e085475587309423d38bfc7f78d0e38f16a7d373159cded644a3761a2496d3b25300c04ee394a8e108a8df791366ad6dcf6154df1ba44b7f9f5ecf
-OpenLibm.v0.7.3+0.x86_64-apple-darwin.tar.gz/md5/6f0f23f859ebbb9e5c1c84fb6cddf4cf
-OpenLibm.v0.7.3+0.x86_64-apple-darwin.tar.gz/sha512/07225ea47276a0ce539f39c1a9a5b924b27521e445db5ba7cbe1338c32fbc8854a40776b85ae9c0a47c6e5f245c42ed81d52cd2680c488a0dd006864f9ca8b92
-OpenLibm.v0.7.3+0.x86_64-linux-gnu.tar.gz/md5/472f1cf73a4d27a3d770a77fe781f24e
-OpenLibm.v0.7.3+0.x86_64-linux-gnu.tar.gz/sha512/3b030ba7fc7ef5f5fa04a3928d954ff093a72f3875ef080e1960bbf704638bc94d666db07e43c1e9ba073d865c6831a02b9e855426a04a37b1d8aa827a56cce5
-OpenLibm.v0.7.3+0.x86_64-linux-musl.tar.gz/md5/696312e71b4bf387857b95069e8dcba7
-OpenLibm.v0.7.3+0.x86_64-linux-musl.tar.gz/sha512/2175cfdc901adb0b7802dbe83a2ef0fea29c412a746594a9a535822f3379343d6379042525b5af5b67c304dc031f938f17a2aa5ed6ed319241e17b852898b5fe
-OpenLibm.v0.7.3+0.x86_64-unknown-freebsd.tar.gz/md5/19873569033a4c7e8c168247ac831f61
-OpenLibm.v0.7.3+0.x86_64-unknown-freebsd.tar.gz/sha512/d72ac9326cc8b27ae3ba0a3209fc202cf2eb879fff88b0c44c0fe89e261d0d6d1aa1acf36956d82938935c5e235ff6b0703f179338646a03ee969997f862744b
-OpenLibm.v0.7.3+0.x86_64-w64-mingw32.tar.gz/md5/e8b030a663a2bef5b8d0607c2d3dc13c
-OpenLibm.v0.7.3+0.x86_64-w64-mingw32.tar.gz/sha512/bab38a06d105a37c7b4ed4232942c3c9c0a4b21c4c6c7144e083f1a6a32cc7cabc6f418f7aa0633f6b8b9cd36739740e58a2274183c75f198fa72421bd032762
-openlibm-c8561015a4376352ece5c02677b19c1af0832300.tar.gz/md5/b54f86f9c6715460e16f289658e05395
-openlibm-c8561015a4376352ece5c02677b19c1af0832300.tar.gz/sha512/de35efdef221591c1d1245f63743a016ba455607482bfa4bc7febcee75dd33d7b3ccdf1ced193c822e027c75019a62e4bfaa656753bd418f20b0d71bec1d4db9
+OpenLibm.v0.7.4+0.aarch64-apple-darwin.tar.gz/md5/fe64fe3e2f82c9db0144b008417b9a84
+OpenLibm.v0.7.4+0.aarch64-apple-darwin.tar.gz/sha512/693f2f98c69ef188e6abef2739c10c13441e58cc6de8561f07e38eba2c08d2220e167b546e537335bbf2a378c33ef150e202fc2fa3d8d832bfa9791b9fa500e6
+OpenLibm.v0.7.4+0.aarch64-linux-gnu.tar.gz/md5/a22114a1ebd68743329408f9d9d4357e
+OpenLibm.v0.7.4+0.aarch64-linux-gnu.tar.gz/sha512/0217ca0e67bee12155d4999a6793e519ef785e7e7e4b467254fe3729366b0994793329517b9de5548549676a20b3b25d7a0846ec3979b41ea69dbebd5218466d
+OpenLibm.v0.7.4+0.aarch64-linux-musl.tar.gz/md5/fc784223d17a0206e36edf99ada29675
+OpenLibm.v0.7.4+0.aarch64-linux-musl.tar.gz/sha512/c950f84fcb2646118e41062c64c3830caee011da5bf1fa8fc2b93ccfe417662472575354c42c7ac3288625888a204099c14d37b49bddb9a71f4d05585595ed45
+OpenLibm.v0.7.4+0.armv6l-linux-gnueabihf.tar.gz/md5/f4fd32b7b093bbb96d3a890809e78b70
+OpenLibm.v0.7.4+0.armv6l-linux-gnueabihf.tar.gz/sha512/a7dd69d1fb81ab90c833efd60db00717d492431a2d383d33b84ca975d67c002f07d78af1d049454fc692bbbaa7cb89d7ba10588534ceb42fbdb9469f5754e62f
+OpenLibm.v0.7.4+0.armv6l-linux-musleabihf.tar.gz/md5/05e97bc68ac51519996fa5028f4fcc7c
+OpenLibm.v0.7.4+0.armv6l-linux-musleabihf.tar.gz/sha512/1a0f98a1f8ef225fcea49bd0513047a5580499748d97650261873244b42feabca2e5c35e9467255832b5769c98a048013e5d6fb48441a5063acdeade799998ad
+OpenLibm.v0.7.4+0.armv7l-linux-gnueabihf.tar.gz/md5/ef43927de56d031e48678e97e7dfa8e0
+OpenLibm.v0.7.4+0.armv7l-linux-gnueabihf.tar.gz/sha512/1232fb753cd504bbbc04dca6ba91c1c1b136a51182f5cd40878bf00089d8bbcdf4d1820960aa9872da61ea17c98c006a90ad7cfeea0554c93703b885140f2927
+OpenLibm.v0.7.4+0.armv7l-linux-musleabihf.tar.gz/md5/becba2d7ee97d24c7bee5086573c9813
+OpenLibm.v0.7.4+0.armv7l-linux-musleabihf.tar.gz/sha512/288e7e41ad827edbbe780d7a05a254190939fecaac768050f67d8f64213429a114cf9fdfa2f3b7972609cd0085d53053f8e8b78c1432ee36ebea7d1679c4fcf9
+OpenLibm.v0.7.4+0.i686-linux-gnu.tar.gz/md5/d97b5cfe2c664cb8a045cc136dc41f85
+OpenLibm.v0.7.4+0.i686-linux-gnu.tar.gz/sha512/06d8d885bff12ba3e9b1a2f4875abe256c9e73d5a625f1202809b1905e487e28395ef932d2cff69844f1f6d41f91c4160fe621ef5ec31da158ee3ddabd917b57
+OpenLibm.v0.7.4+0.i686-linux-musl.tar.gz/md5/80915321cd10bd21778df3b54a38c4e4
+OpenLibm.v0.7.4+0.i686-linux-musl.tar.gz/sha512/28ef561c849a8d98d128875a85c21f6b030905bf903da979fcaa83924b683ac532eedc1710a411fa62649c53ad38959360d40506dda6061fb963be1062a8deb2
+OpenLibm.v0.7.4+0.i686-w64-mingw32.tar.gz/md5/24bff0323984d38817b3b916200004fb
+OpenLibm.v0.7.4+0.i686-w64-mingw32.tar.gz/sha512/a9f4c865a9a2c679c42230627ffd5987abc6cb9d08ac18fc54edd36abe99e7b8bdf09377299de503a9075d5255aaadb1517f05066fc2dd38e34db55f3ee1cb8f
+OpenLibm.v0.7.4+0.powerpc64le-linux-gnu.tar.gz/md5/aaa240cdb07d45d4cc320c669e29b633
+OpenLibm.v0.7.4+0.powerpc64le-linux-gnu.tar.gz/sha512/1e618436aed2d14d5cbe2e1ea1a0dae04a18e7817a20eb90a14c01bf230f35ed6f97c0a2328d916d886c0fcfbc34568e267c8143caa08a7ad5edaf78ff0081ae
+OpenLibm.v0.7.4+0.x86_64-apple-darwin.tar.gz/md5/03ef39fbffa2dfcef6cd757cbdf57d8b
+OpenLibm.v0.7.4+0.x86_64-apple-darwin.tar.gz/sha512/12ec68cd0d789a4ce70cc44e6d8a9ed5af826bfb51a302758c7c4db93e80542194532027d44304c9f56c11b8918e4c9307f800f192100e685e1270dd12649370
+OpenLibm.v0.7.4+0.x86_64-linux-gnu.tar.gz/md5/a86f06c3ec0bef46f1a228f9b038bf37
+OpenLibm.v0.7.4+0.x86_64-linux-gnu.tar.gz/sha512/048cec2a4df9a0dc0fe488609b011e81997bc5fd8a535f78c1280b843ae568c1f2483a4b1a74991d8cb7a30cc99c18b7b5cd1a93031588e7e45648161198581e
+OpenLibm.v0.7.4+0.x86_64-linux-musl.tar.gz/md5/b5c723b30534548d3856bd22665296bd
+OpenLibm.v0.7.4+0.x86_64-linux-musl.tar.gz/sha512/ef262e1bbf1382bfb1b72f26a3e3b5870fd1d5bfe5719bca81d018ab2e635fb1e8872d2ba4f1f37535c1a00bbc6328ec0dea6a6ff7955b68a44d1cf8950ab786
+OpenLibm.v0.7.4+0.x86_64-unknown-freebsd.tar.gz/md5/b16527789074783bb09f54514a1bf741
+OpenLibm.v0.7.4+0.x86_64-unknown-freebsd.tar.gz/sha512/1625ac0af48f348bb34291e5d59975939df4d1b9ba9082d98a2bf88e847e140844226c26c67111382d83fc314faa2aa0d5bf6bcae535eac9fa426558ee3f5225
+OpenLibm.v0.7.4+0.x86_64-w64-mingw32.tar.gz/md5/b5edecd67e9836e6374a1615a90f9f71
+OpenLibm.v0.7.4+0.x86_64-w64-mingw32.tar.gz/sha512/2ccbece5e80a6167362bafea51fdeb94fdef609fdba49577faff8393700b16fcb2eb382797bb2e3cb70d750442ffa30e6ade76297937420f9be2da5d1d04f8cb
+openlibm-5d70ac564c13847d02f8ab4aaada64a1f0856791.tar.gz/md5/d2181cb7af430a7b2c7f8419fbfe6b4f
+openlibm-5d70ac564c13847d02f8ab4aaada64a1f0856791.tar.gz/sha512/727b4b9f3bd01d60d43a76dd5270c1bac0fe99acb713cb79bfd67952a0a315a0cabfed29640d38c96a0ed85c59978418912dd1d44989134a957aa6b6e1c90579
diff --git a/deps/openlibm.version b/deps/openlibm.version
@@ -1,2 +1,2 @@
-OPENLIBM_BRANCH=v0.7.3
-OPENLIBM_SHA1=c8561015a4376352ece5c02677b19c1af0832300
+OPENLIBM_BRANCH=v0.7.4
+OPENLIBM_SHA1=5d70ac564c13847d02f8ab4aaada64a1f0856791
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -4542,7 +4542,7 @@ static jl_cgval_t emit_expr(jl_codectx_t &ctx, jl_value_t *expr, ssize_t ssaval)
             if (ai.isboxed) {
                 vals.push_back(ai.Vboxed);
             }
-            else if (!jl_is_pointerfree(ai.typ)) {
+            else if (jl_is_concrete_immutable(ai.typ) && !jl_is_pointerfree(ai.typ)) {
                 Type *at = julia_type_to_llvm(ctx, ai.typ);
                 vals.push_back(emit_unbox(ctx, at, ai, ai.typ));
             }
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
@@ -48,8 +48,6 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libgcc_s_handle = dlopen(libgcc_s)
     global libgcc_s_path = dlpath(libgcc_s_handle)
     global libgfortran_handle = dlopen(libgfortran)
@@ -58,6 +56,9 @@ function __init__()
     global libstdcxx_path = dlpath(libstdcxx_handle)
     global libgomp_handle = dlopen(libgomp)
     global libgomp_path = dlpath(libgomp_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libgcc_s_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/GMP_jll/src/GMP_jll.jl b/stdlib/GMP_jll/src/GMP_jll.jl
@@ -31,12 +31,13 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libgmp_handle = dlopen(libgmp)
     global libgmp_path = dlpath(libgmp_handle)
     global libgmpxx_handle = dlopen(libgmpxx)
     global libgmpxx_path = dlpath(libgmpxx_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libgmp_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl
@@ -27,10 +27,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libcurl_handle = dlopen(libcurl)
     global libcurl_path = dlpath(libcurl_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libcurl_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
@@ -27,10 +27,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libgit2_handle = dlopen(libgit2)
     global libgit2_path = dlpath(libgit2_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libgit2_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/LibOSXUnwind_jll/src/LibOSXUnwind_jll.jl b/stdlib/LibOSXUnwind_jll/src/LibOSXUnwind_jll.jl
@@ -21,12 +21,13 @@ libosxunwind_path = ""
 const libosxunwind = "@rpath/libosxunwind.dylib"
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     # We only dlopen something on MacOS
     @static if Sys.isapple()
         global libosxunwind_handle = dlopen(libosxunwind)
         global libosxunwind_path = dlpath(libosxunwind_handle)
+        global artifact_dir = dirname(Sys.BINDIR)
+        global LIBPATH[] = dirname(libosxunwind_path)
+        push!(LIBPATH_list, LIBPATH[])
     end
 end
 
diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
@@ -27,10 +27,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libssh2_handle = dlopen(libssh2)
     global libssh2_path = dlpath(libssh2_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libssh2_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 
diff --git a/stdlib/LibUV_jll/src/LibUV_jll.jl b/stdlib/LibUV_jll/src/LibUV_jll.jl
@@ -27,10 +27,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libuv_handle = dlopen(libuv)
     global libuv_path = dlpath(libuv_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libuv_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl b/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl
@@ -21,12 +21,13 @@ libunwind_path = ""
 const libunwind = "libunwind.so.8"
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     # We only do something on Linux/FreeBSD
     @static if Sys.islinux() || Sys.isfreebsd()
         global libunwind_handle = dlopen(libunwind)
         global libunwind_path = dlpath(libunwind_handle)
+        global artifact_dir = dirname(Sys.BINDIR)
+        global LIBPATH[] = dirname(libunwind_path)
+        push!(LIBPATH_list, LIBPATH[])
     end
 end
 
diff --git a/stdlib/MPFR_jll/src/MPFR_jll.jl b/stdlib/MPFR_jll/src/MPFR_jll.jl
@@ -26,10 +26,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libmpfr_handle = dlopen(libmpfr)
     global libmpfr_path = dlpath(libmpfr_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libmpfr_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
@@ -37,14 +37,15 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libmbedcrypto_handle = dlopen(libmbedcrypto)
     global libmbedcrypto_path = dlpath(libmbedcrypto_handle)
     global libmbedtls_handle = dlopen(libmbedtls)
     global libmbedtls_path = dlpath(libmbedtls_handle)
     global libmbedx509_handle = dlopen(libmbedx509)
     global libmbedx509_path = dlpath(libmbedx509_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libmbedtls_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl b/stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl
@@ -6,6 +6,9 @@ baremodule MozillaCACerts_jll
 using Base
 Base.Experimental.@compiler_options compile=min optimize=0 infer=false
 
+const PATH_list = String[]
+const LIBPATH_list = String[]
+
 # These get calculated in __init__()
 PATH = Ref("")
 LIBPATH = Ref("")
@@ -14,7 +17,6 @@ cacert = ""
 
 function __init__()
 	global artifact_dir = dirname(Sys.BINDIR)
-	global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
 	global cacert = normpath(Sys.BINDIR::String, Base.DATAROOTDIR, "julia", "cert.pem")
 end
 
diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
@@ -32,10 +32,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libopenblas_handle = dlopen(libopenblas)
     global libopenblas_path = dlpath(libopenblas_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libopenblas_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/OpenLibm_jll/Project.toml b/stdlib/OpenLibm_jll/Project.toml
@@ -1,6 +1,6 @@
 name = "OpenLibm_jll"
 uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
-version = "0.7.3+0"
+version = "0.7.4+0"
 
 [deps]
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
@@ -26,10 +26,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libopenlibm_handle = dlopen(libopenlibm)
     global libopenlibm_path = dlpath(libopenlibm_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libopenlibm_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/PCRE2_jll/src/PCRE2_jll.jl b/stdlib/PCRE2_jll/src/PCRE2_jll.jl
@@ -26,10 +26,11 @@ else
 end
 
 function __init__()
-    global artifact_dir = dirname(Sys.BINDIR)
-    global LIBPATH[] = joinpath(Sys.BINDIR, Base.LIBDIR, "julia")
     global libpcre2_8_handle = dlopen(libpcre2_8)
     global libpcre2_8_path = dlpath(libpcre2_8_handle)
+    global artifact_dir = dirname(Sys.BINDIR)
+    global LIBPATH[] = dirname(libpcre2_8_path)
+    push!(LIBPATH_list, LIBPATH[])
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.
diff --git a/stdlib/REPL/src/TerminalMenus/config.jl b/stdlib/REPL/src/TerminalMenus/config.jl
@@ -39,7 +39,7 @@ Configure behavior for selection menus via keyword arguments:
 Subtypes of `ConfiguredMenu` will print `cursor`, `up_arrow`, and `down_arrow` automatically
 as needed, your `writeline` method should not print them.
 
-!!! compat Julia 1.6
+!!! compat "Julia 1.6"
     `Config` is available as of Julia 1.6. On older releases use the global `CONFIG`.
 """
 function Config(;
@@ -81,7 +81,7 @@ All other keyword arguments are as described for [`TerminalMenus.Config`](@ref).
 `checked` and `unchecked` are not printed automatically, and should be printed by
 your `writeline` method.
 
-!!! compat Julia 1.6
+!!! compat "Julia 1.6"
     `MultiSelectConfig` is available as of Julia 1.6. On older releases use the global `CONFIG`.
 """
 function MultiSelectConfig(;
@@ -109,7 +109,7 @@ end
 
 Global menu configuration parameters
 
-!!! compat Julia 1.6
+!!! compat "Julia 1.6"
     `CONFIG` is deprecated, instead configure menus via their constructors.
 """
 const CONFIG = Dict{Symbol,Union{Char,String,Bool}}()
@@ -130,7 +130,7 @@ Keyword-only function to configure global menu parameters
  - `supress_output::Bool=false`: Ignored legacy argument, pass `suppress_output` as a keyword argument to `request` instead.
  - `ctrl_c_interrupt::Bool=true`: If `false`, return empty on ^C, if `true` throw InterruptException() on ^C
 
-!!! compat Julia 1.6
+!!! compat "Julia 1.6"
     As of Julia 1.6, `config` is deprecated. Use `Config` or `MultiSelectConfig` instead.
 """
 function config(;charset::Symbol = :na,
diff --git a/stdlib/REPL/test/repl.jl b/stdlib/REPL/test/repl.jl
@@ -453,6 +453,7 @@ for prompt = ["TestΠ", () -> randstring(rand(1:10))]
         # In the future if we want we can add a test that the right object
         # gets displayed by intercepting the display
         repl.specialdisplay = REPL.REPLDisplay(repl)
+        @async write(devnull, stdout_read) # redirect stdout to devnull so we drain the output pipe
 
         repl.interface = REPL.setup_interface(repl)
         repl_mode = repl.interface.modes[1]
diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
diff --git a/stdlib/Zlib_jll/src/Zlib_jll.jl b/stdlib/Zlib_jll/src/Zlib_jll.jl
diff --git a/stdlib/dSFMT_jll/src/dSFMT_jll.jl b/stdlib/dSFMT_jll/src/dSFMT_jll.jl
diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
diff --git a/stdlib/p7zip_jll/src/p7zip_jll.jl b/stdlib/p7zip_jll/src/p7zip_jll.jl
diff --git a/test/compiler/codegen.jl b/test/compiler/codegen.jl
diff --git a/test/core.jl b/test/core.jl
diff --git a/test/misc.jl b/test/misc.jl

Original file line number	Diff line number	Diff line change
`@@ -4542,7 +4542,7 @@ static jl_cgval_t emit_expr(jl_codectx_t &ctx, jl_value_t *expr, ssize_t ssaval)`
`4542`	`4542`	`if (ai.isboxed) {`
`4543`	`4543`	`vals.push_back(ai.Vboxed);`
`4544`	`4544`	`}`
`4545`		`- else if (!jl_is_pointerfree(ai.typ)) {`
	`4545`	`+ else if (jl_is_concrete_immutable(ai.typ) && !jl_is_pointerfree(ai.typ)) {`
`4546`	`4546`	`Type *at = julia_type_to_llvm(ctx, ai.typ);`
`4547`	`4547`	`vals.push_back(emit_unbox(ctx, at, ai, ai.typ));`
`4548`	`4548`	`}`