Skip to content

Commit

Permalink
[libjulia] add or update 1.12-DEV, 1.11-DEV, 1.10 (#8151)
Browse files Browse the repository at this point in the history
Co-authored-by: Benjamin Lorenz <benlorenz@users.noreply.github.com>
  • Loading branch information
fingolfin and benlorenz authored Feb 23, 2024
1 parent 448967c commit eec5291
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 469 deletions.
2 changes: 1 addition & 1 deletion L/libjulia/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Pkg.Types.is_stdlib(uuid::Base.UUID, julia_version::VersionNumber)
return false
end

jllversion=v"1.10.8"
jllversion=v"1.10.9"
for ver in julia_full_versions
build_julia(ARGS, ver; jllversion)
end
38 changes: 38 additions & 0 deletions L/libjulia/bundled/patches/1.10.0/loader_trampolines.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 286b7ba8a36fbe0ea29c599f629dfa7e6b855133 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Thu, 22 Feb 2024 17:42:02 +0100
Subject: [PATCH] Add debug variant of loader_trampolines.o

This prevents a race condition when building 'julia-cli-debug
julia-cli-release' simultaneously (as we do for libjulia_jll, and
also generally seems appropriate given what is done for all other
source files.
---
cli/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/Makefile b/cli/Makefile
index c72ebff2b9..4e32c53b9a 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -48,7 +48,7 @@ LIB_DOBJS := $(BUILDDIR)/loader_lib.dbg.obj
# If this is an architecture that supports dynamic linking, link in a trampoline definition
ifneq (,$(wildcard $(SRCDIR)/trampolines/trampolines_$(ARCH).S))
LIB_OBJS += $(BUILDDIR)/loader_trampolines.o
-LIB_DOBJS += $(BUILDDIR)/loader_trampolines.o
+LIB_DOBJS += $(BUILDDIR)/loader_trampolines.dbg.obj
endif

default: release
@@ -65,6 +65,8 @@ $(BUILDDIR)/loader_exe.dbg.obj : $(SRCDIR)/loader_exe.c $(HEADERS) $(JULIAHOME)/
@$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
$(BUILDDIR)/loader_trampolines.o : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
@$(call PRINT_CC, $(CC) $(SHIPFLAGS) $(LOADER_CFLAGS) $< -c -o $@)
+$(BUILDDIR)/loader_trampolines.dbg.obj : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
+ @$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) $< -c -o $@)

# Debugging target to help us see what kind of code is being generated for our trampolines
dump-trampolines: $(SRCDIR)/trampolines/trampolines_$(ARCH).S
--
2.43.2

Loading

0 comments on commit eec5291

Please sign in to comment.