diff --git a/Make.inc b/Make.inc index 5d58454c80333..973eea024e95e 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 @@ -1177,14 +1174,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 @@ -1268,7 +1257,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.33|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) @@ -1398,7 +1387,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) @@ -1473,12 +1461,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: @@ -1634,20 +1616,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. @@ -1669,7 +1644,6 @@ endef LOADER_BUILD_DEP_LIBS = $(call build_deplibs, \ $(LIBGCC_BUILD_DEPLIB) \ - $(LIBM_BUILD_DEPLIB) \ @$(LIBSTDCXX_BUILD_DEPLIB) \ @$(LIBJULIAINTERNAL_BUILD_DEPLIB) \ @$(LIBJULIACODEGEN_BUILD_DEPLIB) \ @@ -1677,7 +1651,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) \ @@ -1685,14 +1658,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 89fe35b470094..9534daae273c8 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) @@ -293,7 +289,6 @@ 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)/ else diff --git a/THIRDPARTY.md b/THIRDPARTY.md index 89d1ce3de3d97..5e04810abf952 100644 --- a/THIRDPARTY.md +++ b/THIRDPARTY.md @@ -32,7 +32,6 @@ and optionally: Julia's `stdlib` uses the following external libraries, which have their own licenses: - [DSFMT](https://github.com/MersenneTwister-Lab/dSFMT/blob/master/LICENSE.txt) [BSD-3] -- [OPENLIBM](https://github.com/JuliaMath/openlibm/blob/master/LICENSE.md) [MIT, BSD-2, ISC] - [GMP](https://gmplib.org/manual/Copying.html#Copying) [LGPL3+ or GPL2+] - [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception] - [CURL](https://curl.haxx.se/docs/copyright.html) [MIT/X derivative] diff --git a/base/Makefile b/base/Makefile index 6abf9b285ce34..2659f82c8b8ce 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 @@ -224,13 +223,7 @@ $(build_depsbindir)/dsymutil$(EXE): ln -svf "$(DSYMUTIL_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/linking.jl b/base/linking.jl index 2d68ea730c0fb..545893dddd16c 100644 --- a/base/linking.jl +++ b/base/linking.jl @@ -155,7 +155,7 @@ function link_image_cmd(path, out) 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", "-lmsvcrt") end V = VERBOSE[] ? "--verbose" : "" diff --git a/base/math.jl b/base/math.jl index 6ed69188371dd..51fd8adb02e3b 100644 --- a/base/math.jl +++ b/base/math.jl @@ -401,8 +401,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) @@ -1207,7 +1205,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 452abb133c671..0000000000000 --- a/deps/checksums/openlibm +++ /dev/null @@ -1,34 +0,0 @@ -OpenLibm.v0.8.1+2.aarch64-apple-darwin.tar.gz/md5/9ce53048e8944f6edff44f75b731229c -OpenLibm.v0.8.1+2.aarch64-apple-darwin.tar.gz/sha512/3a14e28db0656b47a473e19ca0afae1f8b72dd01e108d6b6cb52dc24fc03e4a43db867616b375369e82177bb274fbcfeb8f24b488ee68871e8da8463e9090adf -OpenLibm.v0.8.1+2.aarch64-linux-gnu.tar.gz/md5/8b284fe2905c3e5315291f5e5f27ca8b -OpenLibm.v0.8.1+2.aarch64-linux-gnu.tar.gz/sha512/d326181349ee7f74b73611cd71f933e93c38c11d6db9a1cd4fee49d1ac06c7f244f4cfc6ab373dd52909064117405b3d4fa39e5c626464c066ab53f1cd26dc4a -OpenLibm.v0.8.1+2.aarch64-linux-musl.tar.gz/md5/dc40ad1f2e53a3b914dcca364b6ead77 -OpenLibm.v0.8.1+2.aarch64-linux-musl.tar.gz/sha512/3779d8cd23c5987a15666e2160e40f5a6fc5e7d350c9e3c86d8af8c99515a8cb1f3b5e8438dae0f3cf0b5e1cb2c0cb74c5dd5a06c65e0c2a2382d86dacfaf9fb -OpenLibm.v0.8.1+2.armv6l-linux-gnueabihf.tar.gz/md5/7c9e56f6124b85e7dee74601f8c16abd -OpenLibm.v0.8.1+2.armv6l-linux-gnueabihf.tar.gz/sha512/a78e15177992025462d334a9d5b10b9c7f6710d77ac36056fe7a1cc3bc3fada87f16696366578cfa5f325d5f746639c41c5d80b4885814014d29556d63bd4c7c -OpenLibm.v0.8.1+2.armv6l-linux-musleabihf.tar.gz/md5/78d9e3178fdf93a35f7d2b0b00753dc6 -OpenLibm.v0.8.1+2.armv6l-linux-musleabihf.tar.gz/sha512/ff7b78786f7035eaa08770ddf7d4eb2984595a318c3ac4dfbe4091ca398e00638df2e77bc2ab5fd159defd0927d4fe46b7e824cf055fbae4860bfa12347e8c5b -OpenLibm.v0.8.1+2.armv7l-linux-gnueabihf.tar.gz/md5/7c9e56f6124b85e7dee74601f8c16abd -OpenLibm.v0.8.1+2.armv7l-linux-gnueabihf.tar.gz/sha512/a78e15177992025462d334a9d5b10b9c7f6710d77ac36056fe7a1cc3bc3fada87f16696366578cfa5f325d5f746639c41c5d80b4885814014d29556d63bd4c7c -OpenLibm.v0.8.1+2.armv7l-linux-musleabihf.tar.gz/md5/78d9e3178fdf93a35f7d2b0b00753dc6 -OpenLibm.v0.8.1+2.armv7l-linux-musleabihf.tar.gz/sha512/ff7b78786f7035eaa08770ddf7d4eb2984595a318c3ac4dfbe4091ca398e00638df2e77bc2ab5fd159defd0927d4fe46b7e824cf055fbae4860bfa12347e8c5b -OpenLibm.v0.8.1+2.i686-linux-gnu.tar.gz/md5/e9942dca99f024ae27876ea5ab1592a9 -OpenLibm.v0.8.1+2.i686-linux-gnu.tar.gz/sha512/406e39894a643bf99c493585fa631800bbbcd6c36aaa9e677de772f7ceaed93b462fdf797235174e22baf2f34c26527f400e282061954b34f05b389acaba1e29 -OpenLibm.v0.8.1+2.i686-linux-musl.tar.gz/md5/0037f2e2113282d49967eba72f215c4b -OpenLibm.v0.8.1+2.i686-linux-musl.tar.gz/sha512/96666332a814232084340791384505acf964064dba4f7b62db51a7ae4416237decb40318dc07b9a041547fd4ff77f204f42bc5c7f029e590af1ee1dd6196d843 -OpenLibm.v0.8.1+2.i686-w64-mingw32.tar.gz/md5/73193f2e5149d07008902adfbf1b74b2 -OpenLibm.v0.8.1+2.i686-w64-mingw32.tar.gz/sha512/e8202b59b8f922bcc908b8b8e6687a674faa701689f5c6175d83fea0bcc5d73f74bed37660e60406f37873dab1d8489e0fd1506294791adfa61a069555eababf -OpenLibm.v0.8.1+2.powerpc64le-linux-gnu.tar.gz/md5/01997fb48464f94f59f4708bd26eabc3 -OpenLibm.v0.8.1+2.powerpc64le-linux-gnu.tar.gz/sha512/1e1d8901fd3aab0948be5c387b8d5bd0db12766fe00bf800ee3100aa0d5973c7aa03ef9c9b4e34942e5e2b46b64035d7f8d7b070113db031d4611f2a7dd02ca3 -OpenLibm.v0.8.1+2.x86_64-apple-darwin.tar.gz/md5/6cb5a472d6c1446acfca11bb8f7283d6 -OpenLibm.v0.8.1+2.x86_64-apple-darwin.tar.gz/sha512/e52f399002544d94536c3bda742d3cc5b0995929d656eeb0e808954fb800fd8e5cfc0ab57279fbccab44fc33a1207ab345d78e685d519ff7f02cca8f554b9c06 -OpenLibm.v0.8.1+2.x86_64-linux-gnu.tar.gz/md5/e1c7dc61e98d5b8aa68de3462a2620a4 -OpenLibm.v0.8.1+2.x86_64-linux-gnu.tar.gz/sha512/fe6d74a2522d75374b87ac9746d444d75a768e069f24f3fbfc6a140aa9d073fa54e8899861f839e647b9261e660c5f2b5555f52fab39ef84a74685b632e89df9 -OpenLibm.v0.8.1+2.x86_64-linux-musl.tar.gz/md5/5fe8eb59d21732a80f432720419324b3 -OpenLibm.v0.8.1+2.x86_64-linux-musl.tar.gz/sha512/0d1b22ca01eda89caa1832b63b1d7ddafe0fedf5906680e817100e2176cbbae95f576409706a9ea1834bc692b72009f4fd244586df30228d18e626bf25fc040a -OpenLibm.v0.8.1+2.x86_64-unknown-freebsd.tar.gz/md5/2bcdf32fdef91433763e32be029814d9 -OpenLibm.v0.8.1+2.x86_64-unknown-freebsd.tar.gz/sha512/97854736fc8c797abd5a5c331e5795dfa9124ac108a76fc2bcac518f5750a08884717d611bb98222b13387bcd27e1c3f4ec841547859e87fafbbe8c7dcd7381a -OpenLibm.v0.8.1+2.x86_64-w64-mingw32.tar.gz/md5/e22079c6e610c9543cca0fb88495d989 -OpenLibm.v0.8.1+2.x86_64-w64-mingw32.tar.gz/sha512/67081bcf360a62eee3928bd1b9d5302ed29b4a176245721723692d5ef938a828379617847308f26a2c7bc0cb2d0dce129d4b8c65c0446c611126894c0aaa5ea8 -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/doc/src/devdocs/build/build.md b/doc/src/devdocs/build/build.md index 52d9482805b9a..539af4cafbaf4 100644 --- a/doc/src/devdocs/build/build.md +++ b/doc/src/devdocs/build/build.md @@ -182,7 +182,6 @@ uses are listed in [`deps/$(libname).version`](https://github.com/JuliaLang/juli - **[LLVM]** (15.0 + [patches](https://github.com/JuliaLang/llvm-project/tree/julia-release/15.x)) — compiler infrastructure (see [note below](#llvm)). - **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end. - **[libuv]** (custom fork) — portable, high-performance event-based I/O library. -- **[OpenLibm]** — portable libm library containing elementary math functions. - **[DSFMT]** — fast Mersenne Twister pseudorandom number generator library. - **[OpenBLAS]** — fast, open, and maintained [basic linear algebra subprograms (BLAS)] - **[LAPACK]** — library of linear algebra routines for solving systems of simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and singular value problems. @@ -212,7 +211,6 @@ uses are listed in [`deps/$(libname).version`](https://github.com/JuliaLang/juli [fetch]: https://www.freebsd.org/cgi/man.cgi?fetch(1) [perl]: https://www.perl.org [cmake]: https://www.cmake.org -[OpenLibm]: https://github.com/JuliaLang/openlibm [DSFMT]: https://github.com/MersenneTwister-Lab/dSFMT [OpenBLAS]: https://github.com/xianyi/OpenBLAS [LAPACK]: https://www.netlib.org/lapack diff --git a/doc/src/manual/embedding.md b/doc/src/manual/embedding.md index 9df9a6c198003..831e2d2be49ec 100644 --- a/doc/src/manual/embedding.md +++ b/doc/src/manual/embedding.md @@ -179,7 +179,7 @@ to the Julia installation before proceeding. Using the project Properties dialog, go to `C/C++` | `General` and add `$(JULIA_DIR)\include\julia\` to the Additional Include Directories property. Then, go to the `Linker` | `General` section and add `$(JULIA_DIR)\lib` -to the Additional Library Directories property. Finally, under `Linker` | `Input`, add `libjulia.dll.a;libopenlibm.dll.a;` +to the Additional Library Directories property. Finally, under `Linker` | `Input`, add `libjulia.dll.a;` to the list of libraries. At this point, the project should build and run. diff --git a/julia.spdx.json b/julia.spdx.json index 63683dd302a39..f6c48f5abf55a 100644 --- a/julia.spdx.json +++ b/julia.spdx.json @@ -158,18 +158,6 @@ "copyrightText": "Copyright (c) 2007, 2008, 2009 Mutsuo Saito, Makoto Matsumoto and Hiroshima University. Copyright (c) 2011, 2002 Mutsuo Saito, Makoto Matsumoto, Hiroshima University and The University of Tokyo.", "summary": "Double precision SIMD-oriented Fast Mersenne Twister" }, - { - "name": "OpenLibm", - "SPDXID": "SPDXRef-OpenLibm", - "downloadLocation": "git+https://github.com/JuliaMath/openlibm.git", - "filesAnalyzed": false, - "homepage": "https://julialang.org", - "sourceInfo": "The git hash of the version in use can be found in the file deps/openlibm.version", - "licenseConcluded": "MIT", - "licenseDeclared": "MIT AND BSD-2-Clause-FreeBSD AND ISC", - "copyrightText": "Copyright (c) 2011-14 The Julia Project. Copyright (c) 2008 Stephen L. Moshier steve@moshier.net Copyright 1992-2011 The FreeBSD Project. All rights reserved. Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.", - "summary": "High quality system independent, portable, open source libm implementation" - }, { "name": "GMP", "SPDXID": "SPDXRef-GMP", @@ -522,11 +510,6 @@ "relationshipType": "BUILD_DEPENDENCY_OF", "relatedSpdxElement": "SPDXRef-JuliaMain" }, - { - "spdxElementId": "SPDXRef-OpenLibm", - "relationshipType": "BUILD_DEPENDENCY_OF", - "relatedSpdxElement": "SPDXRef-JuliaMain" - }, { "spdxElementId": "SPDXRef-GMP", "relationshipType": "BUILD_DEPENDENCY_OF", diff --git a/pkgimage.mk b/pkgimage.mk index c9de49d2f8421..944b19f5e5c4b 100644 --- a/pkgimage.mk +++ b/pkgimage.mk @@ -97,7 +97,6 @@ $(eval $(call stdlib_builder,LibUV_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,LibUnwind_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,MbedTLS_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,nghttp2_jll,Artifacts Libdl)) -$(eval $(call stdlib_builder,OpenLibm_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,PCRE2_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,Zlib_jll,Artifacts Libdl)) $(eval $(call stdlib_builder,dSFMT_jll,Artifacts Libdl)) diff --git a/stdlib/Makefile b/stdlib/Makefile index ebc40c9db2b12..2057e17d55713 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" diff --git a/stdlib/OpenLibm_jll/Project.toml b/stdlib/OpenLibm_jll/Project.toml deleted file mode 100644 index f6162f402bfcf..0000000000000 --- a/stdlib/OpenLibm_jll/Project.toml +++ /dev/null @@ -1,16 +0,0 @@ -name = "OpenLibm_jll" -uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -version = "0.8.1+2" - -[deps] -Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" -Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" - -[compat] -julia = "1.0" - -[extras] -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[targets] -test = ["Test"] diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl deleted file mode 100644 index f2dee45a279cd..0000000000000 --- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl +++ /dev/null @@ -1,45 +0,0 @@ -# This file is a part of Julia. License is MIT: https://julialang.org/license - -## dummy stub for https://github.com/JuliaBinaryWrappers/OpenLibm_jll.jl -baremodule OpenLibm_jll -using Base, Libdl -Base.Experimental.@compiler_options compile=min optimize=0 infer=false - -const PATH_list = String[] -const LIBPATH_list = String[] - -export libopenlibm - -# These get calculated in __init__() -const PATH = Ref("") -const LIBPATH = Ref("") -artifact_dir::String = "" -libopenlibm_handle::Ptr{Cvoid} = C_NULL -libopenlibm_path::String = "" - -if Sys.iswindows() - const libopenlibm = "libopenlibm.dll" -elseif Sys.isapple() - const libopenlibm = "@rpath/libopenlibm.4.dylib" -else - const libopenlibm = "libopenlibm.so.4" -end - -function __init__() - global libopenlibm_handle = dlopen(libopenlibm) - global libopenlibm_path = dlpath(libopenlibm_handle) - global artifact_dir = dirname(Sys.BINDIR) - LIBPATH[] = dirname(libopenlibm_path) - push!(LIBPATH_list, LIBPATH[]) -end - -# JLLWrappers API compatibility shims. Note that not all of these will really make sense. -# For instance, `find_artifact_dir()` won't actually be the artifact directory, because -# there isn't one. It instead returns the overall Julia prefix. -is_available() = true -find_artifact_dir() = artifact_dir -dev_jll() = error("stdlib JLLs cannot be dev'ed") -best_wrapper = nothing -get_libopenlibm_path() = libopenlibm_path - -end # module OpenLibm_jll diff --git a/stdlib/OpenLibm_jll/test/runtests.jl b/stdlib/OpenLibm_jll/test/runtests.jl deleted file mode 100644 index 83603a50a5292..0000000000000 --- a/stdlib/OpenLibm_jll/test/runtests.jl +++ /dev/null @@ -1,7 +0,0 @@ -# This file is a part of Julia. License is MIT: https://julialang.org/license - -using Test, Libdl, OpenLibm_jll - -@testset "OpenLibm_jll" begin - @test ccall((:isopenlibm, libopenlibm), Cint, ()) == 1 -end diff --git a/stdlib/stdlib.mk b/stdlib/stdlib.mk index b23754f3a3cac..dd18be0663870 100644 --- a/stdlib/stdlib.mk +++ b/stdlib/stdlib.mk @@ -9,7 +9,7 @@ INDEPENDENT_STDLIBS := \ SparseArrays Statistics StyledStrings SuiteSparse_jll Tar Test TOML Unicode UUIDs \ dSFMT_jll GMP_jll libLLVM_jll LLD_jll LLVMLibUnwind_jll LibUnwind_jll LibUV_jll \ LibCURL_jll LibSSH2_jll LibGit2_jll nghttp2_jll MozillaCACerts_jll MbedTLS_jll \ - MPFR_jll OpenLibm_jll PCRE2_jll p7zip_jll Zlib_jll + MPFR_jll PCRE2_jll p7zip_jll Zlib_jll PKG_EXTS := \ REPLExt