From 7416f049c43d961e2513e5e39b3ecb8a21911817 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sat, 29 Jul 2023 14:34:36 -0400 Subject: [PATCH] Remove OpenLibm and leverage native Julia implementations Link to the system libm --- Make.inc | 39 +++---------------- Makefile | 6 +-- base/Makefile | 9 +---- base/fastmath.jl | 1 + base/linking.jl | 2 +- base/math.jl | 3 -- contrib/julia-config.jl | 2 +- contrib/refresh_checksums.mk | 2 +- deps/Makefile | 13 ++----- deps/checksums/openlibm | 34 ---------------- deps/openlibm.mk | 34 ---------------- deps/openlibm.version | 7 ---- pkgimage.mk | 3 +- .../InteractiveUtils/src/InteractiveUtils.jl | 1 - stdlib/Makefile | 2 +- 15 files changed, 16 insertions(+), 142 deletions(-) delete mode 100644 deps/checksums/openlibm delete mode 100644 deps/openlibm.mk delete mode 100644 deps/openlibm.version diff --git a/Make.inc b/Make.inc index 04650e68b643e..9d23a67e932fe 100644 --- a/Make.inc +++ b/Make.inc @@ -45,9 +45,6 @@ USE_SYSTEM_LLVM:=0 USE_SYSTEM_LIBUNWIND:=0 DISABLE_LIBUNWIND:=0 USE_SYSTEM_PCRE:=0 -USE_SYSTEM_LIBM:=0 -USE_SYSTEM_OPENLIBM:=0 -UNTRUSTED_SYSTEM_LIBM:=0 USE_SYSTEM_DSFMT:=0 USE_SYSTEM_LIBBLASTRAMPOLINE:=0 USE_SYSTEM_BLAS:=0 @@ -1145,14 +1142,6 @@ LIBLAPACKNAME := liblapack endif endif -ifeq ($(USE_SYSTEM_LIBM), 1) -LIBM := -lm -LIBMNAME := libm -else -LIBM := -lopenlibm -LIBMNAME := libopenlibm -endif - ifeq ($(USE_SYSTEM_LIBUV), 1) LIBUV := $(LOCALBASE)/lib/libuv-julia.a LIBUV_INC := $(LOCALBASE)/include @@ -1236,7 +1225,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.31|GLIBCXX_3\.5\.|GLIBCXX_4\. # Note: we explicitly _do not_ define `CSL` here, since it requires some more # advanced techniques to decide whether it should be installed from a BB source # or not. See `deps/csl.mk` for more detail. -BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT +BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT define SET_BB_DEFAULT # First, check to see if BB is disabled on a global setting ifeq ($$(USE_BINARYBUILDER),0) @@ -1366,7 +1355,6 @@ ifeq ($(ARCH),i686) JLDFLAGS += -Wl,--large-address-aware endif JCPPFLAGS += -D_WIN32_WINNT=0x0502 -UNTRUSTED_SYSTEM_LIBM := 1 # Use hard links for files on windows, rather than soft links # https://stackoverflow.com/questions/3648819/how-to-make-a-symbolic-link-with-cygwin-in-windows-7 # Usage: $(WIN_MAKE_HARD_LINK) @@ -1441,12 +1429,6 @@ USE_BINARYBUILDER_OPENBLAS := 0 USE_BINARYBUILDER_LIBSUITESPARSE := 0 endif -ifeq ($(USE_SYSTEM_LIBM),1) -# If we're using system libm, disable BB OpenLibm -USE_BINARYBUILDER_OPENLIBM := 0 -endif - - # Note: we're passing *FLAGS here computed based on your system compiler to # clang. If that causes you problems, you might want to build and/or run # specific clang-sa-* files with clang explicitly selected: @@ -1602,20 +1584,13 @@ endif LIBSTDCXX_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBSTDCXX_NAME)) endif - -# USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir -ifeq ($(USE_SYSTEM_LIBM),1) -LIBM_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) -else ifeq ($(USE_SYSTEM_OPENLIBM),1) -LIBM_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) -else -LIBM_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) -endif -LIBM_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) +# Symlink system libm +LIBMNAME := libm +#LIBM_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) +#LIBM_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBMNAME).$(SHLIB_EXT)) # We list: # * libgcc_s, because FreeBSD needs to load ours, not the system one. -# * libopenlibm, because Windows has an untrustworthy libm, and we want to use ours more than theirs # * libstdc++, because while performing `libstdc++` probing we need to # know the path to the bundled `libstdc++` library. # * libjulia-internal, which must always come second-to-last. @@ -1637,7 +1612,6 @@ endef LOADER_BUILD_DEP_LIBS = $(call build_deplibs, \ $(LIBGCC_BUILD_DEPLIB) \ - $(LIBM_BUILD_DEPLIB) \ @$(LIBSTDCXX_BUILD_DEPLIB) \ @$(LIBJULIAINTERNAL_BUILD_DEPLIB) \ @$(LIBJULIACODEGEN_BUILD_DEPLIB) \ @@ -1645,7 +1619,6 @@ LOADER_BUILD_DEP_LIBS = $(call build_deplibs, \ LOADER_DEBUG_BUILD_DEP_LIBS = $(call build_deplibs, \ $(LIBGCC_BUILD_DEPLIB) \ - $(LIBM_BUILD_DEPLIB) \ @$(LIBSTDCXX_BUILD_DEPLIB) \ @$(LIBJULIAINTERNAL_DEBUG_BUILD_DEPLIB) \ @$(LIBJULIACODEGEN_DEBUG_BUILD_DEPLIB) \ @@ -1653,14 +1626,12 @@ LOADER_DEBUG_BUILD_DEP_LIBS = $(call build_deplibs, \ LOADER_INSTALL_DEP_LIBS = $(call build_deplibs, \ $(LIBGCC_INSTALL_DEPLIB) \ - $(LIBM_INSTALL_DEPLIB) \ @$(LIBSTDCXX_INSTALL_DEPLIB) \ @$(LIBJULIAINTERNAL_INSTALL_DEPLIB) \ @$(LIBJULIACODEGEN_INSTALL_DEPLIB) \ ) LOADER_DEBUG_INSTALL_DEP_LIBS = $(call build_deplibs, \ $(LIBGCC_INSTALL_DEPLIB) \ - $(LIBM_INSTALL_DEPLIB) \ @$(LIBSTDCXX_INSTALL_DEPLIB) \ @$(LIBJULIAINTERNAL_DEBUG_INSTALL_DEPLIB) \ @$(LIBJULIACODEGEN_DEBUG_INSTALL_DEPLIB) \ diff --git a/Makefile b/Makefile index 2ed0646cf3d6b..6cb96250da310 100644 --- a/Makefile +++ b/Makefile @@ -226,10 +226,6 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM $(LLVM_SHARED_LIB_NAME) endif JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libunwind -ifeq ($(USE_SYSTEM_LIBM),0) -JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENLIBM) += libopenlibm -endif - JL_PRIVATE_LIBS-$(USE_SYSTEM_BLAS) += $(LIBBLASNAME) ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME)) JL_PRIVATE_LIBS-$(USE_SYSTEM_LAPACK) += $(LIBLAPACKNAME) @@ -291,13 +287,13 @@ endif # We have a single exception; we want 7z.dll to live in private_libexecdir, not bindir, so that 7z.exe can find it. -mv $(DESTDIR)$(bindir)/7z.dll $(DESTDIR)$(private_libexecdir)/ - -$(INSTALL_M) $(build_bindir)/libopenlibm.dll.a $(DESTDIR)$(libdir)/ -$(INSTALL_M) $(build_libdir)/libssp.dll.a $(DESTDIR)$(libdir)/ # The rest are compiler dependencies, as an example memcpy is exported by msvcrt # These are files from mingw32 and required for creating shared libraries like our caches. -$(INSTALL_M) $(build_libdir)/libgcc_s.a $(DESTDIR)$(libdir)/ -$(INSTALL_M) $(build_libdir)/libgcc.a $(DESTDIR)$(libdir)/ -$(INSTALL_M) $(build_libdir)/libmsvcrt.a $(DESTDIR)$(libdir)/ + else # Copy over .dSYM directories directly for Darwin diff --git a/base/Makefile b/base/Makefile index ad2bb6a63ccc0..1d2479271612e 100644 --- a/base/Makefile +++ b/base/Makefile @@ -48,7 +48,6 @@ ifeq ($(XC_HOST),) else @echo "const MACHINE = \"$(XC_HOST)\"" >> $@ endif - @echo "const libm_name = \"$(LIBMNAME)\"" >> $@ ifeq ($(USE_BLAS64), 1) @echo "const USE_BLAS64 = true" >> $@ else @@ -218,13 +217,7 @@ $(build_bindir)/lld$(EXE): ln -svf "$(LLD_PATH)" "$@" # the following excludes: libuv.a, libutf8proc.a - -ifneq ($(USE_SYSTEM_LIBM),0) -$(eval $(call symlink_system_library,LIBM,$(LIBMNAME))) -else ifneq ($(USE_SYSTEM_OPENLIBM),0) -$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME))) -endif - +#$(eval $(call symlink_system_library,LIBM,$(LIBMNAME))) # On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+ # (-> libgfortran 5) on x86_64 ifeq ($(OS),Darwin) diff --git a/base/fastmath.jl b/base/fastmath.jl index 44440ebad2050..b6e0ce247f625 100644 --- a/base/fastmath.jl +++ b/base/fastmath.jl @@ -165,6 +165,7 @@ sub_fast(x::T, y::T) where {T<:FloatTypes} = sub_float_fast(x, y) mul_fast(x::T, y::T) where {T<:FloatTypes} = mul_float_fast(x, y) div_fast(x::T, y::T) where {T<:FloatTypes} = div_float_fast(x, y) + add_fast(x::T, y::T, zs::T...) where {T<:FloatTypes} = add_fast(add_fast(x, y), zs...) mul_fast(x::T, y::T, zs::T...) where {T<:FloatTypes} = diff --git a/base/linking.jl b/base/linking.jl index fd21ce74c9268..fa8f040525540 100644 --- a/base/linking.jl +++ b/base/linking.jl @@ -155,7 +155,7 @@ function link_image_cmd(path, out) SHLIBDIR = "-L$(shlibdir())" LIBS = is_debug() ? ("-ljulia-debug", "-ljulia-internal-debug") : ("-ljulia", "-ljulia-internal") @static if Sys.iswindows() - LIBS = (LIBS..., "-lopenlibm", "-lssp", "-lgcc_s", "-lgcc", "-lmsvcrt") + LIBS = (LIBS..., "-lssp", "-lgcc_s", "-lgcc", "-lucrt") end V = VERBOSE[] ? "--verbose" : "" diff --git a/base/math.jl b/base/math.jl index 71bd4949498b5..fe531ff037a5e 100644 --- a/base/math.jl +++ b/base/math.jl @@ -396,8 +396,6 @@ log(b::Number, x::Number) = log(promote(b,x)...) # type specific math functions -const libm = Base.libm_name - # functions with no domain error """ sinh(x) @@ -1164,7 +1162,6 @@ function rem(x::T, p::T, ::RoundingMode{:Nearest}) where T<:IEEEFloat return flipsign(x, oldx) end - """ modf(x) diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl index df17b967c1ed7..2ede71fdefe9d 100755 --- a/contrib/julia-config.jl +++ b/contrib/julia-config.jl @@ -71,7 +71,7 @@ function ldlibs(doframework) (Sys.isapple() ? string() : "-Wl,-rpath,$(shell_escape(private_libDir())) ") * "-l$libname" else - return "-l$libname -lopenlibm" + return "-l$libname -lm" end end diff --git a/contrib/refresh_checksums.mk b/contrib/refresh_checksums.mk index f67088141ccd4..d956115cd9df8 100644 --- a/contrib/refresh_checksums.mk +++ b/contrib/refresh_checksums.mk @@ -24,7 +24,7 @@ CLANG_TRIPLETS=$(filter %-darwin %-freebsd,$(TRIPLETS)) NON_CLANG_TRIPLETS=$(filter-out %-darwin %-freebsd,$(TRIPLETS)) # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded: -BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient +BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse blastrampoline libtracyclient BB_GCC_EXPANDED_PROJECTS=openblas csl BB_CXX_EXPANDED_PROJECTS=gmp llvm clang llvm-tools lld # These are non-BB source-only deps diff --git a/deps/Makefile b/deps/Makefile index 27f5fdbb693d5..61c2130a058f8 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -23,10 +23,10 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST) # if you are adding a new target, it can help to copy an similar, existing target # # autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl -# custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich +# custom Makefile rules: dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich # CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls libtracyclient # -# downloadable via git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2, libtracyclient +# downloadable via git: llvm-svn, libuv, utf8proc, libgit2, libssh2, libtracyclient # # to debug 'define' rules, replace eval at the usage site with info or error @@ -82,12 +82,6 @@ PATCHELF_BIN := $(CUSTOM_LD_LIBRARY_PATH) $(PATCHELF) ## USE_SYSTEM_LIBS options -ifeq ($(USE_SYSTEM_OPENLIBM), 0) -ifeq ($(USE_SYSTEM_LIBM), 0) -DEP_LIBS += openlibm -endif -endif - ifeq ($(USE_SYSTEM_DSFMT), 0) DEP_LIBS += dsfmt endif @@ -190,7 +184,7 @@ DEP_LIBS_STAGED := $(DEP_LIBS) # list all targets DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \ - openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \ + dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \ objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \ sanitizers libsuitesparse lld libtracyclient ittapi JuliaSyntax DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL) @@ -232,7 +226,6 @@ include $(SRCDIR)/ittapi.mk include $(SRCDIR)/llvm.mk include $(SRCDIR)/libuv.mk include $(SRCDIR)/pcre.mk -include $(SRCDIR)/openlibm.mk include $(SRCDIR)/dsfmt.mk include $(SRCDIR)/objconv.mk include $(SRCDIR)/blastrampoline.mk diff --git a/deps/checksums/openlibm b/deps/checksums/openlibm deleted file mode 100644 index 4c8ad913fc58d..0000000000000 --- a/deps/checksums/openlibm +++ /dev/null @@ -1,34 +0,0 @@ -OpenLibm.v0.8.1+0.aarch64-apple-darwin.tar.gz/md5/cbb86fb881fce48d837e40017272f7f5 -OpenLibm.v0.8.1+0.aarch64-apple-darwin.tar.gz/sha512/3fc7753ce12e0012b42e469084351ec97e20c1761b50add48af4b4d92ba61b9db4a015243f31f7ec9bf322a9a4e098cffad31cd4501424568bb49fe973b63a35 -OpenLibm.v0.8.1+0.aarch64-linux-gnu.tar.gz/md5/416b30b38b91a76d1613753ec85ac4a9 -OpenLibm.v0.8.1+0.aarch64-linux-gnu.tar.gz/sha512/9ee5821ee83cd5e29c4f338e0076fe3e3705925e8556abe95f0356151ae93f23be0bbcde42cbf6b382e8c29a201959cb31be349ef3d1447e2d19a414a476fc55 -OpenLibm.v0.8.1+0.aarch64-linux-musl.tar.gz/md5/b170fc0058803377d7c4d7d0c9e4b954 -OpenLibm.v0.8.1+0.aarch64-linux-musl.tar.gz/sha512/be311888953887745a2d64eb3d1d5755e2f37e9f46558c6f6722520c503ee23d3470e97d7bf28f0a03915a398c31080e789d6e1287a2b743b6fd3f37b3a2911a -OpenLibm.v0.8.1+0.armv6l-linux-gnueabihf.tar.gz/md5/63f60d2f13acc6fd2ba3854a8ecf2b0b -OpenLibm.v0.8.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/1853a8346f460cf7e26efefb27c36440976e40f000aefc22a81bb69bb25d07675a19f4b64c4dea8fedaaae76925467739cee8cd5743689ae55512e57dab54286 -OpenLibm.v0.8.1+0.armv6l-linux-musleabihf.tar.gz/md5/5b410e9611b188f34fcc5314c45d2297 -OpenLibm.v0.8.1+0.armv6l-linux-musleabihf.tar.gz/sha512/ecb2fd14728c40c7e3d2cf7c4f1dc06568f1dacc60677218ec59011cd913cab173c33db1c402a8b27b8f0556ca66667ebc033130222617cb4f5d9d8cfe7431ed -OpenLibm.v0.8.1+0.armv7l-linux-gnueabihf.tar.gz/md5/0fc3732640b6bfd52759e74be75e2290 -OpenLibm.v0.8.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/81214ec825d33e37c9e889bea054f3aa72466e5fa585356247ef0ec4653b548f7836219092a8c7f0bc3c694e97582012cd026325e0b1c1a6fc113c461dfe49f7 -OpenLibm.v0.8.1+0.armv7l-linux-musleabihf.tar.gz/md5/7ba7a7f9461b43b8ac622b9fa9c0489a -OpenLibm.v0.8.1+0.armv7l-linux-musleabihf.tar.gz/sha512/e088f806f9fad70b2e6ea28a39ffeb083b4c1c215b1cac73e848a06cb19efcf3ff100e4d401ec2a0ed225ecba6dad115f5d245a612a39c90334a753bc79947e6 -OpenLibm.v0.8.1+0.i686-linux-gnu.tar.gz/md5/4a2eb776682551a25bf1d27e9d8b645e -OpenLibm.v0.8.1+0.i686-linux-gnu.tar.gz/sha512/716808c4a2a8c06439072a39db1f4b93a171a2f42e9677cb7f3eba04f204bc181f96c915ad8c74141952eb783cd82ecf3804ea60d830e3f5d9b88bfb4924223d -OpenLibm.v0.8.1+0.i686-linux-musl.tar.gz/md5/1acd5b790b7b8d1c40c6b094b99fcdb6 -OpenLibm.v0.8.1+0.i686-linux-musl.tar.gz/sha512/22c28a5c5e9542ddfb23297523b56e0a964bc322d252d5681e763c28d4c876dd683d3456297e385f560ab4cf378e5848047aec6cc934850fd0a4df0ea6967b44 -OpenLibm.v0.8.1+0.i686-w64-mingw32.tar.gz/md5/8e974b3bafa9dfe1cdba1d31049d7e85 -OpenLibm.v0.8.1+0.i686-w64-mingw32.tar.gz/sha512/df9e5250dea575341ec1a40d94e3485701690542bc7dfede0504c04fdb7f3fd272d88debdd6546d8644563fb244373b5f4e214da1d0b0133db5b66cdafbf441f -OpenLibm.v0.8.1+0.powerpc64le-linux-gnu.tar.gz/md5/83f68736e911b7c700bf7a8c79cc48a8 -OpenLibm.v0.8.1+0.powerpc64le-linux-gnu.tar.gz/sha512/b879f81d0c02f457310efc08269a7012fe6ed479d33bf79830e48dafce03976425566c5a210ed4833e106848eda038ae531f0c956971b3139c60002a5b1c1325 -OpenLibm.v0.8.1+0.x86_64-apple-darwin.tar.gz/md5/2cd7845dc3d5558cf77e8b6faac4a659 -OpenLibm.v0.8.1+0.x86_64-apple-darwin.tar.gz/sha512/f894c5b7541ebd4f652cb0028b2d367db6af13258d5a42722f19e0ac3a6bc438453e5c2bd17d8b491288c93796ba638c4a3a247f9d33abbac392a6db9169cbcb -OpenLibm.v0.8.1+0.x86_64-linux-gnu.tar.gz/md5/eda96ecab33dfb9a015375813c41d14a -OpenLibm.v0.8.1+0.x86_64-linux-gnu.tar.gz/sha512/641d35dfde15b0868c4ede7d2210ac136e4ca7bf7a969623cbecd792eb09e60824601a6178dbc2c8e4d49523aa105956b5f63566b789003ec736164a8fe5df4b -OpenLibm.v0.8.1+0.x86_64-linux-musl.tar.gz/md5/8d8e6ffa1ad9574bd8ead8b99754e122 -OpenLibm.v0.8.1+0.x86_64-linux-musl.tar.gz/sha512/a66102e69688fdda1c1a51ab07697db0e183b6def21dfed411cd6a92e6c23b22eacd6cccab16e43b86e318d967f81d43dc26bc778746186965bc68c65c7e87a0 -OpenLibm.v0.8.1+0.x86_64-unknown-freebsd.tar.gz/md5/7634eb65eea08ab48a9224295071f058 -OpenLibm.v0.8.1+0.x86_64-unknown-freebsd.tar.gz/sha512/f2c0a6d5113de911aeb516308b1d0ea71a1d61f2ce54c367670a6567444e0030babd66546489e288891678aa6613f40fd0182261de3244f1aed1085c2a32e81c -OpenLibm.v0.8.1+0.x86_64-w64-mingw32.tar.gz/md5/9de4a420caab2cb53ddf86eb0241885a -OpenLibm.v0.8.1+0.x86_64-w64-mingw32.tar.gz/sha512/928675df75d6c6f1e1acc46a2bb554ef120d74671d23e8682adbe05732f668401eaebd98d534e54f7f34e1657d2e1b1d19e18b3822faa891cdf06afd0c3ee56b -openlibm-ae2d91698508701c83cab83714d42a1146dccf85.tar.gz/md5/19408d70bf042a109e1c267a53740089 -openlibm-ae2d91698508701c83cab83714d42a1146dccf85.tar.gz/sha512/9597fdcbc4af8369e6eecc3f8e86f251661cc64d236578f3ee8a6b39e77a47951446e1a0fe1151513da153e7ed17bf39aa5a36c32153d0d0400232bed2839e22 diff --git a/deps/openlibm.mk b/deps/openlibm.mk deleted file mode 100644 index f99cdade47b91..0000000000000 --- a/deps/openlibm.mk +++ /dev/null @@ -1,34 +0,0 @@ -## openlibm ## -ifneq ($(USE_BINARYBUILDER_OPENLIBM), 1) -OPENLIBM_GIT_URL := https://github.com/JuliaMath/openlibm.git -OPENLIBM_TAR_URL = https://api.github.com/repos/JuliaMath/openlibm/tarball/$1 -$(eval $(call git-external,openlibm,OPENLIBM,,,$(BUILDDIR))) - -OPENLIBM_FLAGS := ARCH="$(ARCH)" REAL_ARCH="$(MARCH)" CC="$(CC)" FC="$(FC)" AR="$(AR)" OS="$(OS)" USECLANG=$(USECLANG) USEGCC=$(USEGCC) - -$(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted - $(MAKE) -C $(dir $<) $(OPENLIBM_FLAGS) $(MAKE_COMMON) - echo 1 > $@ - -$(eval $(call staged-install, \ - openlibm,$$(OPENLIBM_SRC_DIR), \ - MAKE_INSTALL,$$(OPENLIBM_FLAGS),, \ - $(INSTALL_NAME_CMD)libopenlibm.$(SHLIB_EXT) $(build_shlibdir)/libopenlibm.$(SHLIB_EXT))) - -clean-openlibm: - -rm -f $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled $(build_libdir)/libopenlibm.a - -$(MAKE) -C $(BUILDDIR)/$(OPENLIBM_SRC_DIR) distclean $(OPENLIBM_FLAGS) - - -get-openlibm: $(OPENLIBM_SRC_FILE) -extract-openlibm: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/source-extracted -configure-openlibm: extract-openlibm -compile-openlibm: $(BUILDDIR)/$(OPENLIBM_SRC_DIR)/build-compiled -fastcheck-openlibm: check-openlibm -check-openlibm: compile-openlibm - -else # USE_BINARYBUILDER_OPENLIBM - -$(eval $(call bb-install,openlibm,OPENLIBM,false)) - -endif diff --git a/deps/openlibm.version b/deps/openlibm.version deleted file mode 100644 index f35b291260380..0000000000000 --- a/deps/openlibm.version +++ /dev/null @@ -1,7 +0,0 @@ -## jll artifact -OPENLIBM_JLL_NAME := OpenLibm - -## source build -OPENLIBM_VER := 0.8.1 -OPENLIBM_BRANCH=v0.8.1 -OPENLIBM_SHA1=ae2d91698508701c83cab83714d42a1146dccf85 diff --git a/pkgimage.mk b/pkgimage.mk index 8b127173b4e05..5b8e3ad2e230a 100644 --- a/pkgimage.mk +++ b/pkgimage.mk @@ -23,7 +23,7 @@ print-depot-path: @$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --startup-file=no -e '@show Base.DEPOT_PATH') STDLIBS := ArgTools Artifacts Base64 CRC32c FileWatching Libdl NetworkOptions SHA Serialization \ - GMP_jll LLVMLibUnwind_jll LibUV_jll LibUnwind_jll MbedTLS_jll OpenLibm_jll PCRE2_jll \ + GMP_jll LLVMLibUnwind_jll LibUV_jll LibUnwind_jll MbedTLS_jll PCRE2_jll \ Zlib_jll dSFMT_jll libLLVM_jll libblastrampoline_jll OpenBLAS_jll Printf Random Tar \ LibSSH2_jll MPFR_jll LinearAlgebra Dates Distributed Future LibGit2 Profile SparseArrays UUIDs \ SharedArrays TOML Test LibCURL Downloads Pkg Dates LazyArtifacts Sockets Unicode Markdown \ @@ -85,7 +85,6 @@ $(eval $(call pkgimg_builder,LibUV_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,LibUnwind_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,MbedTLS_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,nghttp2_jll,Artifacts Libdl)) -$(eval $(call pkgimg_builder,OpenLibm_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,PCRE2_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,Zlib_jll,Artifacts Libdl)) $(eval $(call pkgimg_builder,dSFMT_jll,Artifacts Libdl)) diff --git a/stdlib/InteractiveUtils/src/InteractiveUtils.jl b/stdlib/InteractiveUtils/src/InteractiveUtils.jl index 6cbfc23ac905d..82c0752d3f78d 100644 --- a/stdlib/InteractiveUtils/src/InteractiveUtils.jl +++ b/stdlib/InteractiveUtils/src/InteractiveUtils.jl @@ -159,7 +159,6 @@ function versioninfo(io::IO=stdout; verbose::Bool=false) println(io) end println(io, " WORD_SIZE: ", Sys.WORD_SIZE) - println(io, " LIBM: ",Base.libm_name) println(io, " LLVM: libLLVM-",Base.libllvm_version," (", Sys.JIT, ", ", Sys.CPU_NAME, ")") println(io, " Threads: ", Threads.maxthreadid(), " on ", Sys.CPU_THREADS, " virtual cores") diff --git a/stdlib/Makefile b/stdlib/Makefile index e42061d593905..b3726fe84fc14 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -18,7 +18,7 @@ DIRS := $(build_datarootdir)/julia/stdlib/$(VERSDIR) $(build_prefix)/manifest/$( $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) JLLS = DSFMT GMP CURL LIBGIT2 LLVM LIBSSH2 LIBUV MBEDTLS MPFR NGHTTP2 \ - BLASTRAMPOLINE OPENBLAS OPENLIBM P7ZIP PCRE LIBSUITESPARSE ZLIB \ + BLASTRAMPOLINE OPENBLAS P7ZIP PCRE LIBSUITESPARSE ZLIB \ LLVMUNWIND CSL UNWIND LLD # Initialize this with JLLs that aren't in "deps/$(LibName).version"