lang/julia: Update to 1.10.3

PR:		278694

15 files changed, 220 insertions, 324 deletions

diff --git a/lang/julia/files/General.toml.in b/lang/julia/files/General.toml.in
new file mode 100644
index 000000000000..8b26cbb20aa5
--- /dev/null
+++ b/lang/julia/files/General.toml.in
@@ -0,0 +1,3 @@
+git-tree-sha1 = "%%SHA1%%"
+uuid = "%%UUID%%"
+path = "General.tar.gz"
diff --git a/lang/julia/files/llvm-patch-backport-version-fixes b/lang/julia/files/llvm-patch-backport-version-fixes
index 6964bfd7e54d..3512939ccd4c 100644
--- a/lang/julia/files/llvm-patch-backport-version-fixes
+++ b/lang/julia/files/llvm-patch-backport-version-fixes
@@ -140,17 +140,21 @@ index 000000000000..0c2a3c38c78c
 @@ -0,0 +1 @@
 +LLVMRemarkVersion
 diff --git openmp/libomptarget/plugins/exports openmp/libomptarget/plugins/exports
-index 8664a2e493ee..cc7beda183af 100644
+index 84381af3724d..cc7beda183af 100644
 --- openmp/libomptarget/plugins/exports
 +++ openmp/libomptarget/plugins/exports
-@@ -1,36 +1,6 @@
+@@ -1,40 +1,6 @@
  VERS1.0 {
    global:
+-    __tgt_rtl_init_plugin;
+-    __tgt_rtl_deinit_plugin;
 -    __tgt_rtl_is_valid_binary;
+-    __tgt_rtl_is_valid_binary_info;
 -    __tgt_rtl_is_data_exchangable;
 -    __tgt_rtl_number_of_devices;
 -    __tgt_rtl_init_requires;
 -    __tgt_rtl_init_device;
+-    __tgt_rtl_deinit_device;
 -    __tgt_rtl_load_binary;
 -    __tgt_rtl_data_alloc;
 -    __tgt_rtl_data_submit;
@@ -182,10 +186,10 @@ index 8664a2e493ee..cc7beda183af 100644
      *;
  };
 diff --git openmp/libomptarget/src/exports openmp/libomptarget/src/exports
-index 0ef4c8cce521..425a6fad49cf 100644
+index 35a665a98c27..cedefc996a29 100644
 --- openmp/libomptarget/src/exports
 +++ openmp/libomptarget/src/exports
-@@ -48,7 +48,6 @@ VERS1.0 {
+@@ -51,7 +51,6 @@ VERS1.0 {
      omp_get_interop_int;
      omp_get_interop_name;
      omp_get_interop_type_desc;
@@ -194,7 +198,7 @@ index 0ef4c8cce521..425a6fad49cf 100644
      __tgt_interop_use;
      __tgt_interop_destroy;
 diff --git openmp/runtime/cmake/LibompHandleFlags.cmake openmp/runtime/cmake/LibompHandleFlags.cmake
-index 9e19e59ba17d..1ddbc870e0f1 100644
+index 6643ea392f80..fb1825df71d6 100644
 --- openmp/runtime/cmake/LibompHandleFlags.cmake
 +++ openmp/runtime/cmake/LibompHandleFlags.cmake
 @@ -98,7 +98,6 @@ function(libomp_get_ldflags ldflags)
@@ -206,7 +210,7 @@ index 9e19e59ba17d..1ddbc870e0f1 100644
    libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
    libomp_append(ldflags_local -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
 diff --git openmp/runtime/cmake/config-ix.cmake openmp/runtime/cmake/config-ix.cmake
-index 0fe1266b0067..d3806a446743 100644
+index bd7585545b72..f8d52f3c3e43 100644
 --- openmp/runtime/cmake/config-ix.cmake
 +++ openmp/runtime/cmake/config-ix.cmake
 @@ -131,9 +131,8 @@ if(WIN32)
@@ -302,10 +306,10 @@ index 000000000000..912d160e7c06
 +
 +# end of file #
 diff --git openmp/runtime/src/kmp_runtime.cpp openmp/runtime/src/kmp_runtime.cpp
-index e1af2f43dae7..3db713e8c88b 100644
+index b8d470528798..6edbe6d2d74e 100644
 --- openmp/runtime/src/kmp_runtime.cpp
 +++ openmp/runtime/src/kmp_runtime.cpp
-@@ -9156,3 +9156,20 @@ void __kmp_set_nesting_mode_threads() {
+@@ -9181,3 +9181,20 @@ void __kmp_set_nesting_mode_threads() {
    if (__kmp_nesting_mode == 1) // turn on nesting for this case only
      set__max_active_levels(thread, __kmp_nesting_mode_nlevels);
  }
@@ -348,7 +352,7 @@ index 48d31e5ee7b7..5937f8026e39 100644
 +}
 +#endif
 diff --git openmp/runtime/src/z_Linux_util.cpp openmp/runtime/src/z_Linux_util.cpp
-index 5cd6ad6a0339..f6cad7b5320a 100644
+index 91edf0254a77..0669b208ce62 100644
 --- openmp/runtime/src/z_Linux_util.cpp
 +++ openmp/runtime/src/z_Linux_util.cpp
 @@ -987,7 +987,7 @@ void __kmp_exit_thread(int exit_status) {
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
index d9c0231de3e5..82fc8f2ada30 100644
--- a/lang/julia/files/patch-Make.inc
+++ b/lang/julia/files/patch-Make.inc
@@ -1,6 +1,6 @@
---- Make.inc.orig	2023-11-14 16:57:00 UTC
+--- Make.inc.orig	2024-04-30 17:45:14 UTC
 +++ Make.inc
-@@ -268,7 +268,7 @@ docdir := $(datarootdir)/doc/julia
+@@ -260,7 +260,7 @@ docdir := $(datarootdir)/doc/julia
  libexecdir := $(prefix)/libexec
  datarootdir := $(prefix)/share
  docdir := $(datarootdir)/doc/julia
@@ -9,147 +9,22 @@
  man1dir := $(mandir)/man1
  includedir := $(prefix)/include
  sysconfdir := $(prefix)/etc
-@@ -286,7 +286,7 @@ build_datarootdir := $(build_prefix)/share
- build_libdir := $(build_prefix)/lib
- build_libexecdir := $(build_prefix)/libexec
- build_datarootdir := $(build_prefix)/share
--build_mandir := $(build_datarootdir)/man
-+build_mandir := $(build_prefix)/man
- build_man1dir := $(build_mandir)/man1
- build_includedir := $(build_prefix)/include
- build_sysconfdir := $(build_prefix)/etc
-@@ -654,33 +654,6 @@ endif
- include $(BUILDROOT)/$(MAKE_USER_FNAME)
+@@ -1339,7 +1339,7 @@ ifeq ($(OS), FreeBSD)
  endif
  
--# A bit of a kludge to work around libraries linking to FreeBSD's outdated system libgcc_s
--# Instead, let's link to the libgcc_s corresponding to the installation of gfortran
--ifeq ($(OS),FreeBSD)
--ifneq (,$(findstring gfortran,$(FC)))
--
--# First let's figure out what version of GCC we're dealing with
--_GCCMAJOR := $(shell $(FC) -dumpversion 2>/dev/null | cut -d'.' -f1)
--_GCCMINOR := $(shell $(FC) -dumpversion 2>/dev/null | cut -d'.' -f2)
--
--# The ports system uses major and minor for GCC < 5 (e.g. gcc49 for GCC 4.9), otherwise major only
--ifeq ($(_GCCMAJOR),4)
--  _GCCVER := $(_GCCMAJOR)$(_GCCMINOR)
--else
--  _GCCVER := $(_GCCMAJOR)
--endif
--
--# Allow the user to specify this in Make.user
--GCCPATH ?= $(LOCALBASE)/lib/gcc$(_GCCVER)
--
--# We're going to copy over the libraries we need from GCCPATH into build_libdir, then
--# tell everyone to look for them there. At install time, the build_libdir added into
--# the RPATH here is removed by patchelf.
--LDFLAGS += -L$(build_libdir) -Wl,-rpath,$(build_libdir)
--
--endif # gfortran
--endif # FreeBSD
--
- ifneq ($(CC_BASE)$(CXX_BASE),$(shell echo $(CC) | cut -d' ' -f1)$(shell echo $(CXX) | cut -d' ' -f1))
-     $(error Forgot override directive on CC or CXX in Make.user? Cowardly refusing to build)
- endif
-@@ -1278,7 +1251,7 @@ JLDFLAGS += -Wl,-Bdynamic
- JCPPFLAGS += -DJULIA_HAS_IFUNC_SUPPORT=1
- endif
- JLDFLAGS += -Wl,-Bdynamic
--OSLIBS += -Wl,--version-script=$(JULIAHOME)/src/julia.expmap
-+OSLIBS = -Wl,--version-script=$(JULIAHOME)/src/julia.expmap
- ifneq ($(SANITIZE),1)
- JLDFLAGS += -Wl,-no-undefined
- endif
-@@ -1295,16 +1268,12 @@ JLDFLAGS += -Wl,-Bdynamic
- 
  ifeq ($(OS), FreeBSD)
- JLDFLAGS += -Wl,-Bdynamic
--OSLIBS += -lelf -lkvm -lrt -lpthread -latomic
-+OSLIBS += -lelf -lkvm -lrt -lpthread
+-JLDFLAGS += -Wl,-Bdynamic
++JLDFLAGS += -Wl,-Bdynamic -Wl,-L$(GCCPATH)
+ OSLIBS += -lelf -lkvm -lrt -lpthread -latomic
+ 
+ # Tweak order of libgcc_s in DT_NEEDED,
+@@ -1348,8 +1348,7 @@ OSLIBS += -lgcc_s
+ # See #21788
+ OSLIBS += -lgcc_s
  
--# Tweak order of libgcc_s in DT_NEEDED,
--# make it loaded first to
--# prevent from linking to outdated system libs.
--# See #21788
--OSLIBS += -lgcc_s
--
--OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap \
+-OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(BUILDROOT)/src/julia.expmap \
 -	$(NO_WHOLE_ARCHIVE)
-+JLIBVERFLAGS = -Wl,--version-script=$(JULIAHOME)/src/julialib.expmap
-+JCGVERFLAGS = -Wl,--version-script=$(JULIAHOME)/src/juliacg.expmap
-+JEXEVERFLAGS = -Wl,--version-script=$(JULIAHOME)/src/flisp/juliaexe.expmap
 +OSLIBS += -Wl,--export-dynamic $(NO_WHOLE_ARCHIVE)
  endif
  
  ifeq ($(OS), Darwin)
-@@ -1511,30 +1480,6 @@ LIBJULIACODEGEN_DEBUG_INSTALL_DEPLIB := $(call dep_lib
- LIBJULIACODEGEN_DEBUG_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT))
- LIBJULIACODEGEN_DEBUG_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT))
- 
--ifeq ($(OS),WINNT)
--ifeq ($(BINARY),32)
--LIBGCC_NAME := libgcc_s_sjlj-1.$(SHLIB_EXT)
--else
--LIBGCC_NAME := libgcc_s_seh-1.$(SHLIB_EXT)
--endif
--endif
--# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
--# (-> libgfortran 5) on x86_64
--ifeq ($(OS),Darwin)
--ifeq ($(ARCH),aarch64)
--LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
--else
--ifeq ($(LIBGFORTRAN_VERSION),5)
--LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
--else
--LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
--endif
--endif
--endif
--ifneq ($(findstring $(OS),Linux FreeBSD),)
--LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
--endif
--
- # USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
- ifeq ($(USE_SYSTEM_CSL),1)
- LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME))
-@@ -1567,7 +1512,6 @@ LIBM_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$
- 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.
-@@ -1589,7 +1533,6 @@ LOADER_BUILD_DEP_LIBS = $(call build_deplibs, \
- endef
- 
- LOADER_BUILD_DEP_LIBS = $(call build_deplibs, \
--    $(LIBGCC_BUILD_DEPLIB) \
-     $(LIBM_BUILD_DEPLIB) \
-     @$(LIBSTDCXX_BUILD_DEPLIB) \
-     @$(LIBJULIAINTERNAL_BUILD_DEPLIB) \
-@@ -1597,7 +1540,6 @@ LOADER_DEBUG_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) \
-@@ -1605,14 +1547,12 @@ LOADER_INSTALL_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) \
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index f3091dff5517..0a26e5e5db71 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -1,23 +1,18 @@
---- Makefile.orig	2023-08-24 16:20:21 UTC
+--- Makefile.orig	2024-04-30 17:45:14 UTC
 +++ Makefile
-@@ -210,7 +210,6 @@ endif
- JL_PRIVATE_LIBS-$(USE_SYSTEM_LAPACK) += $(LIBLAPACKNAME)
- endif
- 
--JL_PRIVATE_LIBS-$(USE_SYSTEM_CSL) += libgfortran libquadmath libstdc++ libgcc_s libgomp libssp libatomic
- ifeq ($(OS),Darwin)
- JL_PRIVATE_LIBS-$(USE_SYSTEM_CSL) += libc++
- endif
-@@ -236,7 +235,7 @@ endef
+@@ -265,9 +265,9 @@ endef
  endef
  
  
--install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
+-install: $(build_depsbindir)/stringreplace docs
 +install: $(build_depsbindir)/stringreplace
  	@$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
- 	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
+-	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
++	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
  		mkdir -p $(DESTDIR)$$subdir; \
-@@ -339,8 +338,6 @@ endif
+ 	done
+ 
+@@ -366,8 +366,6 @@ endif
  	cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
  	cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
  	cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
@@ -26,46 +21,26 @@
  	# Remove various files which should not be installed
  	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
  	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
-@@ -350,12 +347,6 @@ endif
- 	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked
- 	# Copy in beautiful new man page
- 	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
--	# Copy .desktop file
--	mkdir -p $(DESTDIR)$(datarootdir)/applications/
--	$(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/
--	# Install appdata file
--	mkdir -p $(DESTDIR)$(datarootdir)/appdata/
--	$(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
- 
- 	# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
- ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
-@@ -430,26 +421,16 @@ endif
- endif
- endif
- 
--ifeq ($(OS),FreeBSD)
--	# On FreeBSD, remove the build's libdir from each library's RPATH
--	$(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(libdir) $(build_libdir)
--	$(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(private_libdir) $(build_libdir)
--	$(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(bindir) $(build_libdir)
--	# Set libgfortran's RPATH to ORIGIN instead of GCCPATH. It's only libgfortran that
--	# needs to be fixed here, as libgcc_s and libquadmath don't have RPATHs set. If we
--	# don't set libgfortran's RPATH, it won't be able to find its friends on systems
--	# that don't have the exact GCC port installed used for the build.
+@@ -462,9 +460,9 @@ ifeq ($(OS),FreeBSD)
+ 	# needs to be fixed here, as libgcc_s and libquadmath don't have RPATHs set. If we
+ 	# don't set libgfortran's RPATH, it won't be able to find its friends on systems
+ 	# that don't have the exact GCC port installed used for the build.
 -	for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
 -		$(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN' $$lib; \
 -	done
--endif
--
- 	mkdir -p $(DESTDIR)$(sysconfdir)
- 	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
++	#for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
++	#	$(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN' $$lib; \
++	#done
+ endif
  
+ 	mkdir -p $(DESTDIR)$(sysconfdir)
+@@ -473,6 +471,10 @@ endif
  ifeq ($(DARWIN_FRAMEWORK),1)
  	$(MAKE) -C $(JULIAHOME)/contrib/mac/framework frameworknoinstall
  endif
 +
-+install-docs:
-+	#Copy documentation
++install-docs: docs
++	# Copy documentation
 +	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
  
  distclean:
diff --git a/lang/julia/files/patch-base_Makefile b/lang/julia/files/patch-base_Makefile
deleted file mode 100644
index 99a5ca8d82bc..000000000000
--- a/lang/julia/files/patch-base_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- base/Makefile.orig	2023-08-24 16:20:21 UTC
-+++ base/Makefile
-@@ -242,9 +242,6 @@ $(eval $(call symlink_system_library,CSL,libstdc++,6))
- $(eval $(call symlink_system_library,CSL,libquadmath,0))
- $(eval $(call symlink_system_library,CSL,libstdc++,6))
- # We allow libssp, libatomic and libgomp to fail as they are not available on all systems
--$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
--$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
--$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
- $(eval $(call symlink_system_library,PCRE,libpcre2-8))
- $(eval $(call symlink_system_library,DSFMT,libdSFMT))
- $(eval $(call symlink_system_library,LIBBLASTRAMPOLINE,libblastrampoline))
diff --git a/lang/julia/files/patch-deps_llvm.mk b/lang/julia/files/patch-deps_llvm.mk
index e1e097d3cb1f..6d0d01e56821 100644
--- a/lang/julia/files/patch-deps_llvm.mk
+++ b/lang/julia/files/patch-deps_llvm.mk
@@ -1,45 +1,21 @@
---- deps/llvm.mk.orig	2023-12-03 21:24:39 UTC
+--- deps/llvm.mk.orig	2024-04-30 17:45:14 UTC
 +++ deps/llvm.mk
-@@ -60,7 +60,10 @@ endif
- LLVM_ENABLE_PROJECTS := $(LLVM_ENABLE_PROJECTS);lld
- endif
- 
-+LLVM_BUILD_BENCHMARKS?=1
-+LLVM_INCLUDE_BENCHMARKS?=1
- 
-+
- LLVM_LIB_FILE := libLLVMCodeGen.a
- 
- # Figure out which targets to build
-@@ -76,6 +79,8 @@ LLVM_CMAKE += -DLLVM_ENABLE_RUNTIMES="$(LLVM_ENABLE_RU
- LLVM_CMAKE += -DLLVM_ENABLE_PROJECTS="$(LLVM_ENABLE_PROJECTS)"
- LLVM_CMAKE += -DLLVM_EXTERNAL_PROJECTS="$(LLVM_EXTERNAL_PROJECTS)"
- LLVM_CMAKE += -DLLVM_ENABLE_RUNTIMES="$(LLVM_ENABLE_RUNTIMES)"
-+LLVM_CMAKE += -DLLVM_ENABLE_BENCHMARKS="$(LLVM_ENABLE_BENCHMARKS)"
-+LLVM_CMAKE += -DLLVM_INCLUDE_BENCHMARKS="$(LLVM_INCLUDE_BENCHMARKS)"
- 
- ifeq ($(USE_RV),1)
- LLVM_CMAKE += -DLLVM_EXTERNAL_RV_SOURCE_DIR=$(LLVM_MONOSRC_DIR)/rv
-@@ -90,6 +95,9 @@ LLVM_LDFLAGS += $(LDFLAGS)
- LLVM_CXXFLAGS += $(CXXFLAGS)
- LLVM_CPPFLAGS += $(CPPFLAGS)
- LLVM_LDFLAGS += $(LDFLAGS)
-+LLVM_CFLAGS += -I$(SRCCACHE)/$(LLVM_SRC_DIR)/third-party/benchmark/include
-+LLVM_LDFLAGS += -L$(LLVM_BUILDDIR_withtype)/lib
-+LLVM_CPPFLAGS += -I$(SRCCACHE)/$(LLVM_SRC_DIR)/third-party/benchmark/include
- LLVM_CMAKE += -DLLVM_TARGETS_TO_BUILD:STRING="$(LLVM_TARGETS)" -DCMAKE_BUILD_TYPE="$(LLVM_CMAKE_BUILDTYPE)"
- LLVM_CMAKE += -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING="$(LLVM_EXPERIMENTAL_TARGETS)"
- LLVM_CMAKE += -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))"
-@@ -231,6 +239,12 @@ $(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
+@@ -214,7 +214,7 @@ $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRC
+ LLVM_PATCH_PREV :=
+ define LLVM_PATCH
+ $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
+-	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR)/llvm && patch -p1 -f < $$(SRCDIR)/patches/$1.patch
++	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$2 && patch -p$3 -f < $$(SRCDIR)/patches/$1.patch
+ 	echo 1 > $$@
+ # declare that applying any patch must re-run the compile step
+ $$(LLVM_BUILDDIR_withtype)/build-compiled: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
+@@ -230,7 +230,8 @@ endef
+ LLVM_PATCH_PREV := $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
  endef
  
- $(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
-+
-+$(SRCCACHE)/$(LLVM_SRC_DIR)/verfix.patch-applied: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted $(LLVM_PATCH_VERSIONFIXES)
-+	cd $(SRCCACHE)/$(LLVM_SRC_DIR) && patch < $(LLVM_PATCH_VERSIONFIXES)
-+	echo 1 > $@
-+
-+$(LLVM_BUILDDIR_withtype)/build-configured: | $(SRCCACHE)/$(LLVM_SRC_DIR)/verfix.patch-applied
+-$(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
++$(eval $(call LLVM_PATCH,llvm-ittapi-cmake,llvm,1))
++$(eval $(call LLVM_PATCH,llvm-version-fixes,.,0))
  
  ifeq ($(USE_SYSTEM_ZLIB), 0)
  $(LLVM_BUILDDIR_withtype)/build-configured: | $(build_prefix)/manifest/zlib
diff --git a/lang/julia/files/patch-deps_zlib.mk b/lang/julia/files/patch-deps_zlib.mk
new file mode 100644
index 000000000000..501a16f09e70
--- /dev/null
+++ b/lang/julia/files/patch-deps_zlib.mk
@@ -0,0 +1,10 @@
+--- deps/zlib.mk.orig	2023-01-18 16:25:14 UTC
++++ deps/zlib.mk
+@@ -9,6 +9,7 @@ $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-configured: $(SRCCAC
+ ZLIB_BUILD_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+ 
+ $(BUILDDIR)/$(ZLIB_SRC_DIR)/build-configured: $(SRCCACHE)/$(ZLIB_SRC_DIR)/source-extracted
++	sed -i bak -e '/gz_intmax;/d' $(SRCCACHE)/$(ZLIB_SRC_DIR)/zlib.map
+ 	mkdir -p $(dir $@)
+ 	cd $(dir $@) && $(CMAKE) $(ZLIB_BUILD_OPTS) $(dir $<)
+ 	echo 1 > $@
diff --git a/lang/julia/files/patch-doc_make.jl b/lang/julia/files/patch-doc_make.jl
new file mode 100644
index 000000000000..fb929ff1674b
--- /dev/null
+++ b/lang/julia/files/patch-doc_make.jl
@@ -0,0 +1,62 @@
+--- doc/make.jl.orig	2024-04-30 17:45:14.000000000 +0000
++++ doc/make.jl	2024-05-10 03:22:43.203136000 +0000
+@@ -5,7 +5,30 @@
+ empty!(DEPOT_PATH)
+ pushfirst!(DEPOT_PATH, joinpath(@__DIR__, "deps"))
+ using Pkg
+-Pkg.instantiate()
++# Pkg.instantiate()
++Pkg.develop([
++    PackageSpec(path="deps/packages/LazilyInitializedFields"),
++    PackageSpec(path="deps/packages/RegistryInstances"),
++    PackageSpec(path="deps/packages/AbstractTrees"),
++    PackageSpec(path="deps/packages/Documenter"),
++    PackageSpec(path="deps/packages/TranscodingStreams"),
++    PackageSpec(path="deps/packages/CodecZlib"),
++    PackageSpec(path="deps/packages/DocumenterInventoryWritingBackport"),
++    PackageSpec(path="deps/packages/Preferences"),
++    PackageSpec(path="deps/packages/JLLWrappers"),
++    PackageSpec(path="deps/packages/OpenSSL_jll"),
++    PackageSpec(path="deps/packages/Libiconv_jll"),
++    PackageSpec(path="deps/packages/Git_jll"),
++    PackageSpec(path="deps/packages/Git"),
++    PackageSpec(path="deps/packages/Expat_jll"),
++    PackageSpec(path="deps/packages/ANSIColoredPrinters"),
++    PackageSpec(path="deps/packages/PrecompileTools"),
++    PackageSpec(path="deps/packages/Parsers"),
++    PackageSpec(path="deps/packages/MarkdownAST"),
++    PackageSpec(path="deps/packages/JSON"),
++    PackageSpec(path="deps/packages/IOCapture"),
++    PackageSpec(path="deps/packages/DocStringExtensions")
++])
+ 
+ using Documenter
+ using DocumenterInventoryWritingBackport
+@@ -288,6 +311,13 @@
+         collapselevel = 1,
+         sidebar_sitename = false,
+         ansicolor = true,
++        size_threshold_ignore = [
++            "base/arrays.md",
++            "base/base.md",
++            "base/collections.md",
++            "manual/unicode-input.md",
++            "stdlib/LinearAlgebra.md",
++        ],
+     )
+ end
+ 
+@@ -299,12 +329,12 @@
+     doctest   = ("doctest=fix" in ARGS) ? (:fix) : ("doctest=only" in ARGS) ? (:only) : ("doctest=true" in ARGS) ? true : false,
+     linkcheck = "linkcheck=true" in ARGS,
+     linkcheck_ignore = ["https://bugs.kde.org/show_bug.cgi?id=136779"], # fails to load from nanosoldier?
+-    strict    = true,
+     checkdocs = :none,
+     format    = format,
+     sitename  = "The Julia Language",
+     authors   = "The Julia Project",
+     pages     = PAGES,
++    remotes   = nothing,
+ )
+ 
+ # Update URLs to external stdlibs (JuliaLang/julia#43199)
diff --git a/lang/julia/files/patch-doc_src_manual_unicode-input.md b/lang/julia/files/patch-doc_src_manual_unicode-input.md
new file mode 100644
index 000000000000..5a73e43e69f9
--- /dev/null
+++ b/lang/julia/files/patch-doc_src_manual_unicode-input.md
@@ -0,0 +1,11 @@
+--- doc/src/manual/unicode-input.md.orig	2024-05-10 00:16:25 UTC
++++ doc/src/manual/unicode-input.md
+@@ -70,7 +70,7 @@ function table_entries(completions, unicode_dict)
+             join(inputs, ", "), join(unicode_names, " + ")
+         ])
+     end
+-    return Markdown.Table(entries, [:l, :l, :l, :l])
++    return Markdown.MD(entries, [:l, :l, :l, :l])
+ end
+ 
+ table_entries(
diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile
index 6ab152ba0277..728d1f542e70 100644
--- a/lang/julia/files/patch-src_Makefile
+++ b/lang/julia/files/patch-src_Makefile
@@ -1,12 +1,49 @@
---- src/Makefile.orig	2023-11-14 16:57:00 UTC
+--- src/Makefile.orig	2024-04-30 17:45:14 UTC
 +++ src/Makefile
-@@ -363,15 +363,40 @@ CXXLD = $(CXX) -shared
+@@ -128,7 +128,8 @@ ifneq ($(USE_LLVM_SHLIB),1)
+ # USE_SYSTEM_LLVM == 0
+ ifneq ($(USE_LLVM_SHLIB),1)
+ # USE_LLVM_SHLIB != 1
+-CG_LLVMLINK += $(LLVM_LDFLAGS) $(shell $(LLVM_CONFIG_HOST) --libs $(CG_LLVM_LIBS) --link-static) $($(LLVM_LDFLAGS) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
++# CG_LLVMLINK += $(LLVM_LDFLAGS) $(shell $(LLVM_CONFIG_HOST) --libs $(CG_LLVM_LIBS) --link-static) $($(LLVM_LDFLAGS) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
++CG_LLVMLINK += $(LLVM_LDFLAGS) $($(LLVM_LDFLAGS) $(shell $(LLVM_CONFIG_HOST) --libs 2> /dev/null)
+ else
+ # USE_LLVM_SHLIB == 1
+ ifeq ($(OS), Darwin)
+@@ -144,7 +145,8 @@ endif # JULIACODEGEN == LLVM
+ endif # USE_LLVM_SHLIB == 1
+ endif # JULIACODEGEN == LLVM
+ 
+-RT_LLVM_LINK_ARGS := $(shell $(LLVM_CONFIG_HOST) --libs $(RT_LLVM_LIBS) --system-libs --link-static)
++# RT_LLVM_LINK_ARGS := $(shell $(LLVM_CONFIG_HOST) --libs $(RT_LLVM_LIBS) --system-libs --link-static)
++RT_LLVM_LINK_ARGS := $(shell $(LLVM_CONFIG_HOST) --libs --system-libs)
+ RT_LLVMLINK += $(LLVM_LDFLAGS) $(RT_LLVM_LINK_ARGS)
+ ifeq ($(OS), WINNT)
+ RT_LLVMLINK += -luuid -lole32
+@@ -347,10 +349,10 @@ $(FLISP_EXECUTABLE_debug): $(BUILDDIR)/flisp/libflisp-
+ $(FLISP_EXECUTABLE_debug): $(BUILDDIR)/flisp/libflisp-debug.a
+ 	$(MAKE) -C $(BUILDDIR)/flisp $(subst $(abspath $(BUILDDIR)/flisp)/,,$(abspath $(FLISP_EXECUTABLE_debug)))
+ 
+-$(BUILDDIR)/flisp/libflisp.a: $(addprefix $(SRCDIR)/flisp/,*.h *.c) $(BUILDDIR)/support/libsupport.a $(BUILDDIR)/julia.expmap
++$(BUILDDIR)/flisp/libflisp.a: $(addprefix $(SRCDIR)/flisp/,*.h *.c) $(BUILDDIR)/support/libsupport.a $(BUILDDIR)/juliaflisp.expmap
+ 	$(MAKE) -C $(SRCDIR)/flisp BUILDDIR='$(abspath $(BUILDDIR)/flisp)'
+ 
+-$(BUILDDIR)/flisp/libflisp-debug.a: $(addprefix $(SRCDIR)/,flisp/*.h flisp/*.c) $(BUILDDIR)/support/libsupport-debug.a $(BUILDDIR)/julia.expmap
++$(BUILDDIR)/flisp/libflisp-debug.a: $(addprefix $(SRCDIR)/,flisp/*.h flisp/*.c) $(BUILDDIR)/support/libsupport-debug.a $(BUILDDIR)/juliaflisp.expmap
+ 	$(MAKE) -C $(SRCDIR)/flisp debug BUILDDIR='$(abspath $(BUILDDIR)/flisp)'
+ 
+ $(BUILDDIR)/julia_version.h: $(JULIAHOME)/VERSION
+@@ -368,17 +370,50 @@ CXXLD = $(CXX) -shared
  
  CXXLD = $(CXX) -shared
  
--$(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
-+$(BUILDDIR)/julialib.expmap $(BUILDDIR)/juliacg.expmap: $(SRCDIR)/julia.expmap
+-$(BUILDDIR)/julia.expmap: $(SRCDIR)/julia.expmap.in
+-	sed <'$<' >'$@' -e "s/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/" \
+-		        -e "s/@LLVM_SHLIB_SYMBOL_VERSION@/$(LLVM_SHLIB_SYMBOL_VERSION)/"
++$(BUILDDIR)/julialib.expmap $(BUILDDIR)/juliacg.expmap $(BUILDDIR)/juliaflisp.expmap: $(SRCDIR)/julia.expmap.in
 +	sed <'$<' >$(BUILDDIR)/julialib.expmap \
++		-e "s/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/" \
++	        -e "s/@LLVM_SHLIB_SYMBOL_VERSION@/$(LLVM_SHLIB_SYMBOL_VERSION)/" \
 +		-e "/environ;/d" -e "/__progname;/d" \
 +		-e "/__stack_chk_guard;/d" -e "/asprintf;/d" \
 +		-e "/small_arraylist_grow;/d" -e "/rec_backtrace;/d" \
@@ -16,6 +53,8 @@
 +		-e "/add_library_mapping;/d" -e "/_IO_stdin_used;/d" \
 +		-e "/llvmGetPassPluginInfo;/d"
 +	sed <'$<' >$(BUILDDIR)/juliacg.expmap \
++		-e "s/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/" \
++	        -e "s/@LLVM_SHLIB_SYMBOL_VERSION@/$(LLVM_SHLIB_SYMBOL_VERSION)/" \
 +		-e "/environ;/d" -e "/__progname;/d" \
 +		-e "/__stack_chk_guard;/d" -e "/asprintf;/d" \
 +		-e "/arraylist_grow;/d" -e "/small_arraylist_grow;/d" \
@@ -27,51 +66,51 @@
 +		-e "/rl_clear_input;/d" -e "/save_arg_area_loc;/d" \
 +		-e "/add_library_mapping;/d" -e "/_IO_stdin_used;/d" \
 +		-e "/N4llvm9StringRefEi;/d" -e "/llvmGetPassPluginInfo;/d"
-+
++	sed <'$<' >$(BUILDDIR)/juliaflisp.expmap \
++		-e "s/@JULIA_SHLIB_SYMBOL_VERSION@/JL_LIBJULIA_$(SOMAJOR)/" \
++	        -e "s/@LLVM_SHLIB_SYMBOL_VERSION@/$(LLVM_SHLIB_SYMBOL_VERSION)/" \
++		-e "/__stack_chk_guard;/d" -e "/asprintf;/d" \
++		-e "/rec_backtrace;/d" -e "/localtime_r;/d" \
++		-e "/restore_arg_area_loc;/d" -e "/restore_signals;/d" \
++		-e "/rl_clear_input;/d" -e "/save_arg_area_loc;/d" \
++		-e "/add_library_mapping;/d" -e "/jlbacktrace;/d" \
++		-e "/jlbacktracet;/d" -e "/_IO_stdin_used;/d" \
++		-e "/N4llvm9StringRefEi;/d" -e "/llvmGetPassPluginInfo;/d"
+ 
+-$(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
 +$(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julialib.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
  	@$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ \
--		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-internal.$(JL_MAJOR_SHLIB_EXT)))
-+		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_RELEASE_LIBS) $(JLIBVERFLAGS) \
-+		$(call SONAME_FLAGS,libjulia-internal.$(JL_MAJOR_SHLIB_EXT)))
+ 		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-internal.$(JL_MAJOR_SHLIB_EXT)))
  	@$(INSTALL_NAME_CMD)libjulia-internal.$(SHLIB_EXT) $@
  	$(DSYMUTIL) $@
  
--$(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
+-$(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
 +$(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julialib.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
  	@$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ \
--		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-internal-debug.$(JL_MAJOR_SHLIB_EXT)))
-+		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_DEBUG_LIBS) $(JLIBVERFLAGS) \
-+		$(call SONAME_FLAGS,libjulia-internal-debug.$(JL_MAJOR_SHLIB_EXT)))
+ 		$(JLDFLAGS) $(JLIBLDFLAGS) $(RT_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-internal-debug.$(JL_MAJOR_SHLIB_EXT)))
  	@$(INSTALL_NAME_CMD)libjulia-internal-debug.$(SHLIB_EXT) $@
- 	$(DSYMUTIL) $@
- 
-@@ -389,15 +414,17 @@ libjulia-internal-debug libjulia-internal-release: $(P
+@@ -400,13 +435,13 @@ libjulia-internal-debug libjulia-internal-release: $(P
  libjulia-internal-debug: $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
  libjulia-internal-debug libjulia-internal-release: $(PUBLIC_HEADER_TARGETS)
  
--$(build_shlibdir)/libjulia-codegen.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(CODEGEN_OBJS) $(BUILDDIR)/support/libsupport.a $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT)
-+$(build_shlibdir)/libjulia-codegen.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julialib.expmap $(CODEGEN_OBJS) $(BUILDDIR)/support/libsupport.a $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT)
+-$(build_shlibdir)/libjulia-codegen.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julia.expmap $(CODEGEN_OBJS) $(BUILDDIR)/support/libsupport.a $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT)
++$(build_shlibdir)/libjulia-codegen.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/juliacg.expmap $(CODEGEN_OBJS) $(BUILDDIR)/support/libsupport.a $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT)
  	@$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(CODEGEN_OBJS) $(RPATH_LIB) -o $@ \
--		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-codegen.$(JL_MAJOR_SHLIB_EXT)))
-+		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_RELEASE_LIBS) $(JCGVERFLAGS) \
-+		$(call SONAME_FLAGS,libjulia-codegen.$(JL_MAJOR_SHLIB_EXT)))
+ 		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-codegen.$(JL_MAJOR_SHLIB_EXT)))
  	@$(INSTALL_NAME_CMD)libjulia-codegen.$(SHLIB_EXT) $@
  	$(DSYMUTIL) $@
  
--$(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(CODEGEN_DOBJS) $(BUILDDIR)/support/libsupport-debug.a $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
-+$(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julialib.expmap $(CODEGEN_DOBJS) $(BUILDDIR)/support/libsupport-debug.a $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
+-$(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/julia.expmap $(CODEGEN_DOBJS) $(BUILDDIR)/support/libsupport-debug.a $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
++$(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(BUILDDIR)/juliacg.expmap $(CODEGEN_DOBJS) $(BUILDDIR)/support/libsupport-debug.a $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
  	@$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(CODEGEN_DOBJS) $(RPATH_LIB) -o $@ \
--		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT)))
-+		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_DEBUG_LIBS) $(JCGVERFLAGS) \
-+		$(call SONAME_FLAGS,libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT)))
+ 		$(JLDFLAGS) $(JLIBLDFLAGS) $(CG_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT)))
  	@$(INSTALL_NAME_CMD)libjulia-codegen-debug.$(SHLIB_EXT) $@
- 	$(DSYMUTIL) $@
- 
-@@ -420,6 +447,7 @@ clean:
+@@ -436,7 +471,7 @@ clean:
+ 	-rm -fr $(build_shlibdir)/libjulia-internal* $(build_shlibdir)/libjulia-codegen* $(build_shlibdir)/libccalltest* $(build_shlibdir)/libllvmcalltest*
  	-rm -f $(BUILDDIR)/julia_flisp.boot $(BUILDDIR)/julia_flisp.boot.inc $(BUILDDIR)/jl_internal_funcs.inc
  	-rm -f $(BUILDDIR)/*.dbg.obj $(BUILDDIR)/*.o $(BUILDDIR)/*.dwo $(BUILDDIR)/*.$(SHLIB_EXT) $(BUILDDIR)/*.a $(BUILDDIR)/*.h.gen
+-	-rm -f $(BUILDDIR)/julia.expmap
++	-rm -f $(BUILDDIR)/julia*.expmap
  	-rm -f $(BUILDDIR)/julia_version.h
-+	-rm -f $(BUILDDIR)/julialib.expmap $(BUILDDIR)/juliacg.exmap
  
  clean-flisp:
- 	-$(MAKE) -C $(SRCDIR)/flisp clean BUILDDIR='$(abspath $(BUILDDIR)/flisp)'
diff --git a/lang/julia/files/patch-src_flisp_Makefile b/lang/julia/files/patch-src_flisp_Makefile
deleted file mode 100644
index b0c169dcdaf6..000000000000
--- a/lang/julia/files/patch-src_flisp_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/flisp/Makefile.orig	2023-11-14 16:57:00 UTC
-+++ src/flisp/Makefile
-@@ -95,12 +95,22 @@ CCLD := $(CC)
- 
- CCLD := $(CC)
- 
--$(BUILDDIR)/$(EXENAME)-debug$(EXE): $(DOBJS) $(LIBFILES_debug) $(BUILDDIR)/$(LIBTARGET)-debug.a $(BUILDDIR)/flmain.dbg.obj | $(BUILDDIR)/flisp.boot
--	@$(call PRINT_LINK, $(CCLD) $(DEBUGFLAGS) $(JLDFLAGS) $(DOBJS) $(BUILDDIR)/flmain.dbg.obj -o $@ $(BUILDDIR)/$(LIBTARGET)-debug.a $(LIBFILES_debug) $(LIBS) $(OSLIBS))
-+$(BUILDDIR)/juliaexe.expmap: $(JULIAHOME)/src/julia.expmap
-+	sed <'$<' >'$@' \
-+		-e "/__stack_chk_guard;/d" -e "/asprintf;/d" \
-+		-e "/rec_backtrace;/d" -e "/localtime_r;/d" \
-+		-e "/restore_arg_area_loc;/d" -e "/restore_signals;/d" \
-+		-e "/rl_clear_input;/d" -e "/save_arg_area_loc;/d" \
-+		-e "/add_library_mapping;/d" -e "/jlbacktrace;/d" \
-+		-e "/jlbacktracet;/d" -e "/_IO_stdin_used;/d" \
-+		-e "/N4llvm9StringRefEi;/d" -e "/llvmGetPassPluginInfo;/d"
- 
--$(BUILDDIR)/$(EXENAME)$(EXE): $(OBJS) $(LIBFILES_release) $(BUILDDIR)/$(LIBTARGET).a $(BUILDDIR)/flmain.o | $(BUILDDIR)/flisp.boot
--	@$(call PRINT_LINK, $(CCLD) $(SHIPFLAGS) $(JLDFLAGS) $(OBJS) $(BUILDDIR)/flmain.o -o $@ $(BUILDDIR)/$(LIBTARGET).a $(LIBFILES_release) $(LIBS) $(OSLIBS))
-+$(BUILDDIR)/$(EXENAME)-debug$(EXE): $(DOBJS) $(LIBFILES_debug) $(BUILDDIR)/$(LIBTARGET)-debug.a $(BUILDDIR)/flmain.dbg.obj $(BUILDDIR)/juliaexe.expmap | $(BUILDDIR)/flisp.boot
-+	@$(call PRINT_LINK, $(CCLD) $(DEBUGFLAGS) $(JLDFLAGS) $(DOBJS) $(BUILDDIR)/flmain.dbg.obj -o $@ $(BUILDDIR)/$(LIBTARGET)-debug.a $(LIBFILES_debug) $(LIBS) $(OSLIBS) $(JEXEVERFLAGS))
- 
-+$(BUILDDIR)/$(EXENAME)$(EXE): $(OBJS) $(LIBFILES_release) $(BUILDDIR)/$(LIBTARGET).a $(BUILDDIR)/flmain.o $(BUILDDIR)/juliaexe.expmap | $(BUILDDIR)/flisp.boot
-+	@$(call PRINT_LINK, $(CCLD) $(SHIPFLAGS) $(JLDFLAGS) $(OBJS) $(BUILDDIR)/flmain.o -o $@ $(BUILDDIR)/$(LIBTARGET).a $(LIBFILES_release) $(LIBS) $(OSLIBS) $(JEXEVERFLAGS))
-+
- $(BUILDDIR)/host/Makefile:
- 	mkdir -p $(BUILDDIR)/host
- 	@# add Makefiles to the build directories for convenience (pointing back to the source location of each)
-@@ -133,5 +143,6 @@ clean:
- 	rm -f $(BUILDDIR)/$(EXENAME)$(EXE)
- 	rm -f $(BUILDDIR)/$(EXENAME)-debug$(EXE)
- 	rm -f $(BUILDDIR)/host/*
-+	rm -f $(BUILDDIR)/*.expmap
- 
- .PHONY: flisp-deps
diff --git a/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl b/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
index f704eded5503..75b67255eb07 100644
--- a/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
+++ b/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
@@ -1,10 +1,10 @@
---- stdlib/LibGit2_jll/src/LibGit2_jll.jl.orig	2023-05-09 10:56:52 UTC
+--- stdlib/LibGit2_jll/src/LibGit2_jll.jl.orig	2024-04-30 17:45:14 UTC
 +++ stdlib/LibGit2_jll/src/LibGit2_jll.jl
 @@ -23,7 +23,7 @@ else
  elseif Sys.isapple()
-     const libgit2 = "@rpath/libgit2.1.5.dylib"
+     const libgit2 = "@rpath/libgit2.1.6.dylib"
  else
--    const libgit2 = "libgit2.so.1.5"
+-    const libgit2 = "libgit2.so.1.6"
 +    const libgit2 = "libgit2.so"
  end
  
diff --git a/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl b/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
index c2486f73d59e..cc73cd012953 100644
--- a/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
+++ b/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
@@ -1,4 +1,4 @@
---- stdlib/MbedTLS_jll/src/MbedTLS_jll.jl.orig	2022-11-21 01:45:43 UTC
+--- stdlib/MbedTLS_jll/src/MbedTLS_jll.jl.orig	2024-04-30 17:45:14 UTC
 +++ stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
 @@ -31,9 +31,9 @@ else
      const libmbedtls = "@rpath/libmbedtls.14.dylib"
diff --git a/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl b/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
index 4b198e28c35c..4bd6986e6ea7 100644
--- a/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
+++ b/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
@@ -1,4 +1,4 @@
---- stdlib/OpenLibm_jll/src/OpenLibm_jll.jl.orig	2022-11-21 01:47:29 UTC
+--- stdlib/OpenLibm_jll/src/OpenLibm_jll.jl.orig	2024-04-30 17:45:14 UTC
 +++ stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
 @@ -22,7 +22,7 @@ else
  elseif Sys.isapple()
diff --git a/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl b/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl
deleted file mode 100644
index 65523f1da6b4..000000000000
--- a/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- stdlib/Zlib_jll/src/Zlib_jll.jl.orig	2022-05-16 12:16:57 UTC
-+++ stdlib/Zlib_jll/src/Zlib_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
-     const libz = "@rpath/libz.1.dylib"
- else
--    const libz = "libz.so.1"
-+    const libz = "libz.so"
- end
- 
- function __init__()