mirror of
https://github.com/SerenityOS/serenity.git
synced 2026-11-07 04:29:30 -10:00
Ports: Update bdwgc to 8.2.12
The dropped patch was upstreamed: https://github.com/bdwgc/bdwgc/commit/b1f17958cd60e25e6be8e8cf7576187dd9884936
This commit is contained in:
Linus Groh authored and Sönke Holz committed
1 parent
8313fd83e2
commit
75624b8e25
5 files changed
+11
-51
No files matched your search
@@ -18,7 +18,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
||||
| [`bash`](bash/) | GNU Bash | 5.3 | https://www.gnu.org/software/bash/ |
|
||||
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
|
||||
| [`bc`](bc/) | bc | 7.0.3 | https://github.com/gavinhoward/bc |
|
||||
| [`bdwgc`](bdwgc/) | Boehm-Demers-Weiser Garbage Collector (libgc) | 8.2.10 | https://github.com/ivmai/bdwgc |
|
||||
| [`bdwgc`](bdwgc/) | Boehm-Demers-Weiser Garbage Collector (libgc) | 8.2.12 | https://github.com/bdwgc/bdwgc |
|
||||
| [`binutils`](binutils/) | GNU Binutils | 2.44 | https://www.gnu.org/software/binutils/ |
|
||||
| [`bison`](bison/) | GNU Bison | 3.8.2 | https://www.gnu.org/software/bison/ |
|
||||
| [`bochs`](bochs/) | Bochs x86 PC emulator | 2.7 | https://sourceforge.net/projects/bochs/ |
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port='bdwgc'
|
||||
version='8.2.10'
|
||||
version='8.2.12'
|
||||
files=(
|
||||
"https://github.com/bdwgc/bdwgc/releases/download/v${version}/gc-${version}.tar.gz#832cf4f7cf676b59582ed3b1bbd90a8d0e0ddbc3b11cb3b2096c5177ce39cc47"
|
||||
"https://github.com/bdwgc/bdwgc/releases/download/v${version}/gc-${version}.tar.gz#42e5194ad06ab6ffb806c83eb99c03462b495d979cda782f3c72c08af833cd4e"
|
||||
)
|
||||
workdir="gc-${version}"
|
||||
useconfigure='true'
|
||||
|
||||
@@ -19,7 +19,7 @@ It crashes otherwise:
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/test.c b/tests/test.c
|
||||
index 6cce7984f1efeab38f6fcce39e12d384069c9de6..5d7163109c7e4b14ab17c169893fbbda3ad83a4a 100644
|
||||
index 0ae3f95b53983342c1f441923a1ee17124afb150..6881b3cf85c1eebf02487b9a634e2a60c8febf12 100644
|
||||
--- a/tests/test.c
|
||||
+++ b/tests/test.c
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Linus Groh <[email protected]>
|
||||
Date: Fri, 24 Oct 2025 23:34:35 +0100
|
||||
Subject: [PATCH] Add explicit integer to pointer cast
|
||||
|
||||
```
|
||||
[bdwgc/build] In file included from extra/gc.c:63:
|
||||
[bdwgc/build] extra/../os_dep.c: In function 'GC_get_stack_base':
|
||||
[bdwgc/build] extra/../os_dep.c:878:16: error: assignment to 'void *' from 'long unsigned int' makes pointer from integer without a cast [-Wint-conversion]
|
||||
[bdwgc/build] 878 | sb->mem_base = base + size;
|
||||
[bdwgc/build] |
|
||||
```
|
||||
---
|
||||
os_dep.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/os_dep.c b/os_dep.c
|
||||
index 0650a3dc854e486657eb93c277ea82e3cf845907..6a710aa19de601623669fb91ee1698dcfef9e261 100644
|
||||
--- a/os_dep.c
|
||||
+++ b/os_dep.c
|
||||
@@ -875,7 +875,7 @@ GC_get_stack_base(struct GC_stack_base *sb)
|
||||
WARN("get_stack_bounds failed\n", 0);
|
||||
return GC_UNIMPLEMENTED;
|
||||
}
|
||||
- sb->mem_base = base + size;
|
||||
+ sb->mem_base = (void*)(base + size);
|
||||
return GC_SUCCESS;
|
||||
}
|
||||
# define HAVE_GET_STACK_BASE
|
||||
@@ -7,23 +7,12 @@ test: Set NTHREADS to 0
|
||||
It crashes otherwise:
|
||||
|
||||
```
|
||||
0x000000078c79c017: [/usr/lib/libsystem.so] syscall1 +0x7 (syscall.cpp:20 => syscall.cpp:19)
|
||||
0x00000012967e283d: [/usr/lib/libc.so] pthread_mutex_lock.localalias +0x6d (serenity.h:43 => pthread_integration.cpp:158)
|
||||
0x0000000143bf0344: [/home/anon/gctest] GC_thread_is_registered +0x74 (pthread_support.c:911)
|
||||
0x0000000143bdb46f: [/home/anon/gctest] run_one_test +0x1f (test.c:1576)
|
||||
0x0000000143bd8e5d: [/home/anon/gctest] main +0x1ed (test.c:2731)
|
||||
0x0000000143bd9854: [/home/anon/gctest] _entry +0x24 (crt0.cpp:47)
|
||||
```
|
||||
|
||||
## `0002-Add-explicit-integer-to-pointer-cast.patch`
|
||||
|
||||
Add explicit integer to pointer cast
|
||||
|
||||
```
|
||||
[bdwgc/build] In file included from extra/gc.c:63:
|
||||
[bdwgc/build] extra/../os_dep.c: In function 'GC_get_stack_base':
|
||||
[bdwgc/build] extra/../os_dep.c:878:16: error: assignment to 'void *' from 'long unsigned int' makes pointer from integer without a cast [-Wint-conversion]
|
||||
[bdwgc/build] 878 | sb->mem_base = base + size;
|
||||
[bdwgc/build] |
|
||||
0x00000015e4c9b017: [/usr/lib/libsystem.so] syscall1 +0x7 (syscall.cpp:20 => syscall.cpp:19)
|
||||
0x00000002018903eb: [/home/anon/gctest] GC_suspend_handler +0xab (pthread_stop_world.c:406 => pthread_stop_world.c:263)
|
||||
0x0000001eb725200d: ???
|
||||
0x000000050209d666: [/usr/lib/libc.so] sem_timedwait +0x86 (serenity.h:43 => semaphore.cpp:372)
|
||||
0x000000020188fb26: [/home/anon/gctest] GC_pthread_create +0x106 (pthread_support.c:2356)
|
||||
0x0000000201877d2e: [/home/anon/gctest] main +0x12e (test.c:2438)
|
||||
0x0000000201878064: [/home/anon/gctest] _entry +0x24 (crt0.cpp:47)
|
||||
```
|
||||
|
||||
Reference in new issue
Block a user