Skip to content

Commit e1d83b0

Browse files
committed
[julia-git] update patch for LLVM 22 support
1 parent 58f66d8 commit e1d83b0

32 files changed

Lines changed: 780 additions & 738 deletions

File tree

alarmcn/julia-git/0001-Force-enable-GDB-debug-info-registration.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From f56439ae91f4033ba7c8cabcecf0b8c1d00a769b Mon Sep 17 00:00:00 2001
1+
From ae341f2350fffcbf88b799b4ab3c8c78e6cfc8d0 Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Sat, 3 Oct 2020 08:45:51 -0400
4-
Subject: [PATCH 01/14] Force enable GDB debug info registration
4+
Subject: [PATCH 1/9] Force enable GDB debug info registration
55

66
---
77
src/codegen.cpp | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/src/codegen.cpp b/src/codegen.cpp
11-
index bc0782355c..7d72634f27 100644
11+
index a83a900ee6..d4984b24e3 100644
1212
--- a/src/codegen.cpp
1313
+++ b/src/codegen.cpp
14-
@@ -10584,7 +10584,7 @@ extern "C" void jl_init_llvm(void)
14+
@@ -10864,7 +10864,7 @@ extern "C" void jl_init_llvm(void)
1515

1616
bool jl_using_gdb_jitevents = false;
1717
// Register GDB event listener

alarmcn/julia-git/0002-Fix-source-file-paths.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 4d38dd381d3ed2d8bac5f318a5a8cd8b610f54bb Mon Sep 17 00:00:00 2001
1+
From aa7ac18cefa10e3ecd3452c2116128d0f41fc7d1 Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Sun, 19 Jul 2020 09:40:32 -0400
4-
Subject: [PATCH 02/14] Fix source file paths
4+
Subject: [PATCH 2/9] Fix source file paths
55

66
---
77
base/sysimg.jl | 7 +++++++
@@ -11,10 +11,10 @@ Subject: [PATCH 02/14] Fix source file paths
1111
4 files changed, 26 insertions(+), 2 deletions(-)
1212

1313
diff --git a/base/sysimg.jl b/base/sysimg.jl
14-
index 54effbbbd1..65fa94e246 100644
14+
index 8466400948..13a9fb34d9 100644
1515
--- a/base/sysimg.jl
1616
+++ b/base/sysimg.jl
17-
@@ -125,6 +125,13 @@ let
17+
@@ -124,6 +124,13 @@ let
1818

1919
print_time("Stdlibs total", tot_time_stdlib)
2020
end
@@ -29,7 +29,7 @@ index 54effbbbd1..65fa94e246 100644
2929
# Clear global state
3030
empty!(Core.ARGS)
3131
diff --git a/base/sysinfo.jl b/base/sysinfo.jl
32-
index 07be8e1554..0a9203445d 100644
32+
index 68104e1d6e..08a73245eb 100644
3333
--- a/base/sysinfo.jl
3434
+++ b/base/sysinfo.jl
3535
@@ -48,7 +48,7 @@ A string containing the full path to the directory containing the `stdlib` packa
@@ -59,10 +59,10 @@ index a81908b96a..4c463db143 100644
5959
write(io, filename)
6060
write(io, UInt64(sizeof(src)))
6161
diff --git a/src/ast.c b/src/ast.c
62-
index 8196e2e0e7..e27c9bc49b 100644
62+
index 5a6867ae33..8a934ae982 100644
6363
--- a/src/ast.c
6464
+++ b/src/ast.c
65-
@@ -740,6 +740,18 @@ static value_t julia_to_scm_(fl_context_t *fl_ctx, jl_value_t *v, int check_vali
65+
@@ -753,6 +753,18 @@ static value_t julia_to_scm_(fl_context_t *fl_ctx, jl_value_t *v, int check_vali
6666
return julia_to_scm_noalloc2(fl_ctx, v, check_valid);
6767
}
6868

@@ -81,7 +81,7 @@ index 8196e2e0e7..e27c9bc49b 100644
8181
// Parse `text` starting at 0-based `offset` and attributing the content to
8282
// `filename`. Return an svec of (parsed_expr, final_offset)
8383
JL_DLLEXPORT jl_value_t *jl_fl_parse(const char *text, size_t text_len,
84-
@@ -765,6 +777,7 @@ JL_DLLEXPORT jl_value_t *jl_fl_parse(const char *text, size_t text_len,
84+
@@ -778,6 +790,7 @@ JL_DLLEXPORT jl_value_t *jl_fl_parse(const char *text, size_t text_len,
8585
fl_context_t *fl_ctx = &ctx->fl;
8686
value_t fl_text = cvalue_static_cstrn(fl_ctx, text, text_len);
8787
fl_gc_handle(fl_ctx, &fl_text);

alarmcn/julia-git/0003-Clear-soname-and-hard-code-system-lib-path.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From bfa5171ef76fc2e8658e5c86a4c1ca3a1ec4080a Mon Sep 17 00:00:00 2001
1+
From 910d6cdeae0944715474625d653d9ea7950fbf9d Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Tue, 22 Jun 2021 10:35:16 -0400
4-
Subject: [PATCH 03/14] Clear soname and hard code system lib path
4+
Subject: [PATCH 3/9] Clear soname and hard code system lib path
55

66
---
77
.../src/CompilerSupportLibraries_jll.jl | 150 ++---------
@@ -28,7 +28,7 @@ Subject: [PATCH 03/14] Clear soname and hard code system lib path
2828
21 files changed, 150 insertions(+), 892 deletions(-)
2929

3030
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
31-
index 9aec22b58b..8526b75387 100644
31+
index 9aec22b58b..7a47a973b0 100644
3232
--- a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
3333
+++ b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
3434
@@ -10,127 +10,24 @@ export libgfortran, libstdcxx, libgomp, libatomic, libgcc_s
@@ -167,7 +167,7 @@ index 9aec22b58b..8526b75387 100644
167167
+const libgcc_s = LazyLibrary(libgcc_s_path)
168168
+const libgfortran_path = "/usr/lib/libgfortran.so"
169169
+const libgfortran = LazyLibrary(libgfortran_path)
170-
+const libstdcxx_path = "/usr/lib/libstd++.so"
170+
+const libstdcxx_path = "/usr/lib/libstdc++.so"
171171
+const libstdcxx = LazyLibrary(libstdcxx_path)
172172
+const libgomp_path = "/usr/lib/libgomp.so"
173173
+const libgomp = LazyLibrary(libgomp_path)
@@ -264,7 +264,7 @@ index 12a3fc21bd..7ecd0c91e3 100644
264264
precompile(eager_mode, ())
265265
precompile(is_available, ())
266266
diff --git a/stdlib/LLD_jll/src/LLD_jll.jl b/stdlib/LLD_jll/src/LLD_jll.jl
267-
index 9b8365dddc..7c6a4cebc9 100644
267+
index 208964c0cc..48ddff5efe 100644
268268
--- a/stdlib/LLD_jll/src/LLD_jll.jl
269269
+++ b/stdlib/LLD_jll/src/LLD_jll.jl
270270
@@ -5,16 +5,15 @@
@@ -1227,7 +1227,7 @@ index a52168bf24..b27161814e 100644
12271227
precompile(eager_mode, ())
12281228
precompile(is_available, ())
12291229
diff --git a/stdlib/Zstd_jll/src/Zstd_jll.jl b/stdlib/Zstd_jll/src/Zstd_jll.jl
1230-
index 30481a12e0..8dfa2fb405 100644
1230+
index 1fbfd18446..5139d08ed4 100644
12311231
--- a/stdlib/Zstd_jll/src/Zstd_jll.jl
12321232
+++ b/stdlib/Zstd_jll/src/Zstd_jll.jl
12331233
@@ -13,29 +13,14 @@ export libzstd, zstd, zstdmt

alarmcn/julia-git/0004-Support-loading-extensions-from-STDLIB.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 836576d19b566a95bc6d8f0eb664057b10107110 Mon Sep 17 00:00:00 2001
1+
From 943c1b35bae4ca6f23d8c9cb1b6054349815f472 Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Wed, 30 Aug 2023 09:28:03 -0400
4-
Subject: [PATCH 04/14] Support loading extensions from STDLIB
4+
Subject: [PATCH 4/9] Support loading extensions from STDLIB
55

66
---
77
base/loading.jl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
88
1 file changed, 48 insertions(+)
99

1010
diff --git a/base/loading.jl b/base/loading.jl
11-
index eb5eb2bce3..faad55c7c4 100644
11+
index 10e3420015..cc91335fbe 100644
1212
--- a/base/loading.jl
1313
+++ b/base/loading.jl
1414
@@ -1343,6 +1343,34 @@ end

alarmcn/julia-git/0005-julia-git-add-a-safeguard-for-bad-unwinding.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 4306838b5446de2a5aa7ae44eb7014f40e1c4329 Mon Sep 17 00:00:00 2001
1+
From 787cdbc5a95d4aa3be2f25fcd50320d56b93a870 Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Tue, 3 Oct 2023 19:00:59 -0400
4-
Subject: [PATCH 05/14] [julia-git] add a safeguard for bad unwinding
4+
Subject: [PATCH 5/9] [julia-git] add a safeguard for bad unwinding
55

66
---
77
src/stackwalk.c | 2 ++
88
1 file changed, 2 insertions(+)
99

1010
diff --git a/src/stackwalk.c b/src/stackwalk.c
11-
index 3b3c21d405..141e69f0a7 100644
11+
index 79a15ecdd8..95520a7e82 100644
1212
--- a/src/stackwalk.c
1313
+++ b/src/stackwalk.c
14-
@@ -291,6 +291,8 @@ JL_DLLEXPORT jl_value_t *jl_backtrace_from_here(int returnsp, int skip)
14+
@@ -292,6 +292,8 @@ JL_DLLEXPORT jl_value_t *jl_backtrace_from_here(int returnsp, int skip)
1515
size_t size_incr = 0;
1616
have_more_frames = jl_unw_stepn(&cursor, jl_array_data(ip, jl_bt_element_t) + offset,
1717
&size_incr, sp_ptr, maxincr, skip, &pgcstack, 0);

alarmcn/julia-git/0006-Disable-UCX-signal-handler.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 334229142ad79164dc183c9b029c358ed1274df1 Mon Sep 17 00:00:00 2001
1+
From da01816272939e2538aa1b5c83629ea239736f2f Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Mon, 26 May 2025 23:20:16 -0400
4-
Subject: [PATCH 06/14] Disable UCX signal handler
4+
Subject: [PATCH 6/9] Disable UCX signal handler
55

66
---
77
src/init.c | 2 ++
88
1 file changed, 2 insertions(+)
99

1010
diff --git a/src/init.c b/src/init.c
11-
index e4efe1607c..1fff8a8057 100644
11+
index 4863813e18..4e8b8677b8 100644
1212
--- a/src/init.c
1313
+++ b/src/init.c
14-
@@ -697,6 +697,8 @@ static void init_global_mutexes(void) {
14+
@@ -687,6 +687,8 @@ static void init_global_mutexes(void) JL_NOTSAFEPOINT {
1515

1616
JL_DLLEXPORT void jl_init_(jl_image_buf_t sysimage)
1717
{

alarmcn/julia-git/0007-julia-git-Better-support-for-loading-packages-from-s.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From 08860a2d5adbd948d9cdcaefe497b5f2baac25d4 Mon Sep 17 00:00:00 2001
1+
From bc66bbab3a454fbaff7239c3bd8517ebcf15891a Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Fri, 15 Aug 2025 12:24:38 -0400
4-
Subject: [PATCH 07/14] [julia-git] Better support for loading packages from
4+
Subject: [PATCH 7/9] [julia-git] Better support for loading packages from
55
stdlib
66

77
---
88
base/loading.jl | 4 ++++
99
1 file changed, 4 insertions(+)
1010

1111
diff --git a/base/loading.jl b/base/loading.jl
12-
index faad55c7c4..9a2ddb2b57 100644
12+
index cc91335fbe..d343596b5f 100644
1313
--- a/base/loading.jl
1414
+++ b/base/loading.jl
1515
@@ -1313,6 +1313,10 @@ function explicit_manifest_entry_load_spec(manifest_file::String, pkg::PkgId, en

alarmcn/julia-git/0008-Reduce-likelyhood-of-symbol-conflict.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 080d393d03c3efbafeca023fd9e2b399246ef650 Mon Sep 17 00:00:00 2001
1+
From 9732371d453f8041ff55bfb76c94effadcce245c Mon Sep 17 00:00:00 2001
22
From: Yichao Yu <yyc1992@gmail.com>
33
Date: Sun, 24 Aug 2025 19:28:22 -0400
4-
Subject: [PATCH 08/14] Reduce likelyhood of symbol conflict
4+
Subject: [PATCH 8/9] Reduce likelyhood of symbol conflict
55

66
---
77
base/docs/Docs.jl | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/base/docs/Docs.jl b/base/docs/Docs.jl
11-
index 5b60115742..c097cd757a 100644
11+
index 71c4491555..abb31995a5 100644
1212
--- a/base/docs/Docs.jl
1313
+++ b/base/docs/Docs.jl
14-
@@ -75,7 +75,7 @@ export doc, hasdoc, undocumented_names
14+
@@ -74,7 +74,7 @@ export doc, hasdoc, undocumented_names
1515
# Basic API / Storage
1616

1717
const modules = Module[]

alarmcn/julia-git/0009-Remove-size-argument-to-llvm.lifetime.patch

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)