summaryrefslogtreecommitdiffhomepage
path: root/patches/bdwgc.local.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/bdwgc.local.patch')
-rw-r--r--patches/bdwgc.local.patch97
1 files changed, 48 insertions, 49 deletions
diff --git a/patches/bdwgc.local.patch b/patches/bdwgc.local.patch
index ede786e7..d7c4214d 100644
--- a/patches/bdwgc.local.patch
+++ b/patches/bdwgc.local.patch
@@ -1,48 +1,47 @@
-diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
-index b342883..174dd88 100644
---- a/include/private/gcconfig.h
-+++ b/include/private/gcconfig.h
-@@ -109,6 +109,21 @@ EXTERN_C_BEGIN
+diff -ru bdwgc.orig/include/private/gcconfig.h bdwgc/include/private/gcconfig.h
+--- bdwgc.orig/include/private/gcconfig.h 2023-02-07 14:35:54.616933050 +0100
++++ bdwgc/include/private/gcconfig.h 2023-02-07 14:41:11.028698667 +0100
+@@ -110,6 +110,20 @@
# define LINUX
# endif
+# if defined(__midipix__)
-+# define MIDIPIX
++# define MIDIPIX
++# include <fcntl.h>
++# include <sys/select.h>
+
-+# include <fcntl.h>
-+# include <sys/select.h>
++# include <psxtypes/psxtypes.h>
++# include <pemagine/pemagine.h>
++# include <ntapi/nt_thread.h>
+
-+# include <psxtypes/psxtypes.h>
-+# include <pemagine/pemagine.h>
-+# include <ntapi/nt_thread.h>
++int __gc_data_start_mark__[1];
++int __gc_data_end_mark__[1];
++#endif
+
-+ int __gc_data_start_mark__[1];
-+ int __gc_data_end_mark__[1];
-+
-+# endif
+
/* And one for NetBSD: */
# if defined(__NetBSD__)
- # define NETBSD
-@@ -350,6 +359,16 @@ EXTERN_C_BEGIN
- # define X86_64
- # define mach_type_known
+ # define NETBSD
+@@ -554,7 +554,7 @@
+ # define mach_type_known
+ # elif (defined(__i386__) || defined(i386) || defined(__X86__)) \
+ && (defined(ANY_BSD) || defined(DARWIN) || defined(EMBOX) \
+- || defined(LINUX) || defined(QNX))
++ || defined(LINUX) || defined(QNX) || defined(MIDIPIX))
+ # define I386
+ # define mach_type_known
+ # elif (defined(__ia64) || defined(__ia64__)) && defined(LINUX)
+@@ -607,7 +607,7 @@
+ # elif (defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) \
+ || defined(__X86_64__)) \
+ && (defined(ANY_BSD) || defined(DARWIN) || defined(LINUX) \
+- || defined(QNX))
++ || defined(QNX) || defined(MIDIPIX))
+ # define X86_64
+ # define mach_type_known
# endif
-+# if defined(MIDIPIX)
-+# if defined(__i386__)
-+# define I386
-+# define mach_type_known
-+# endif
-+# if defined(__x86_64__)
-+# define X86_64
-+# define mach_type_known
-+# endif
-+# endif
- # if defined(LINUX) && (defined(i386) || defined(__i386__))
- # define I386
- # define mach_type_known
-@@ -1542,6 +1561,13 @@ EXTERN_C_BEGIN
- EXTERN_C_BEGIN
+@@ -1464,6 +1478,13 @@
+ # define SOFT_VDB
# endif
# endif
+# ifdef MIDIPIX
@@ -53,28 +52,28 @@ index b342883..174dd88 100644
+# define USE_MMAP_ANON
+# endif
# ifdef CYGWIN32
- # define OS_TYPE "CYGWIN32"
# define WOW64_THREAD_CONTEXT_WORKAROUND
-@@ -2706,6 +2732,13 @@ EXTERN_C_BEGIN
- EXTERN_C_BEGIN
+ # define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */
+@@ -2259,6 +2280,13 @@
+ # define SOFT_VDB
# endif
# endif
+# ifdef MIDIPIX
-+# define OS_TYPE "MIDIPIX"
-+# define DATASTART ((ptr_t)__gc_data_start_mark__)
-+# define DATAEND ((ptr_t)__gc_data_end_mark__)
-+# define STACKBOTTOM (ptr_t)(((nt_tib *)pe_get_teb_address())->stack_base)
-+# define USE_MMAP_ANON
++# define OS_TYPE "MIDIPIX"
++# define DATASTART ((ptr_t)__gc_data_start_mark__)
++# define DATAEND ((ptr_t)__gc_data_end_mark__)
++# define STACKBOTTOM (ptr_t)(((nt_tib *)pe_get_teb_address())->stack_base)
++# define USE_MMAP_ANON
+# endif
# ifdef DARWIN
- # define OS_TYPE "DARWIN"
# define DARWIN_DONT_PARSE_STACK 1
-@@ -3111,7 +3144,7 @@ EXTERN_C_BEGIN
- #if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
- || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
- || defined(DGUX) || defined(BSD) || defined(HAIKU) || defined(HURD) \
-- || defined(AIX) || defined(DARWIN) || defined(OSF1)
-+ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(MIDIPIX)
+ # define STACKBOTTOM ((ptr_t)0x7fff5fc00000)
+@@ -2676,7 +2676,7 @@
+ #if defined(AIX) || defined(ANY_BSD) || defined(BSD) || defined(DARWIN) \
+ || defined(DGUX) || defined(HAIKU) || defined(HPUX) || defined(HURD) \
+ || defined(IRIX5) || defined(LINUX) || defined(OSF1) || defined(QNX) \
+- || defined(SVR4)
++ || defined(SVR4) || defined(MIDIPIX)
# define UNIX_LIKE /* Basic Unix-like system calls work. */
#endif