Skip to content

Commit

Permalink
libgc diff
Browse files Browse the repository at this point in the history
  • Loading branch information
ahgamut committed Nov 12, 2023
1 parent 5b32073 commit 39905b0
Showing 1 changed file with 3 additions and 41 deletions.
44 changes: 3 additions & 41 deletions lib/libgc-8.2.4/minimal.diff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN ./gc-8.2.4/configure /home/ahgamut/sources/gc-8.2.4/configure
--- ./gc-8.2.4/configure 2023-05-26 18:57:16.000000000 +0000
+++ - 2023-11-09 05:30:07.671209178 +0000
+++ ./gc-8.2.4/configure 2023-11-09 05:30:07.671209178 +0000
@@ -17184,7 +17184,7 @@
# We should set -fexceptions if we are using gcc and might be used
# inside something like gcj. This is the zeroth approximation:
Expand All @@ -12,7 +12,7 @@ diff -urN ./gc-8.2.4/configure /home/ahgamut/sources/gc-8.2.4/configure
hppa*-*-hpux* )
diff -urN ./gc-8.2.4/include/private/gcconfig.h /home/ahgamut/sources/gc-8.2.4/include/private/gcconfig.h
--- ./gc-8.2.4/include/private/gcconfig.h 2023-05-26 18:56:18.000000000 +0000
+++ - 2023-11-09 05:30:49.391450600 +0000
+++ ./gc-8.2.4/include/private/gcconfig.h 2023-11-09 05:30:49.391450600 +0000
@@ -712,6 +712,18 @@
# define mach_type_known
# endif
Expand All @@ -32,47 +32,9 @@ diff -urN ./gc-8.2.4/include/private/gcconfig.h /home/ahgamut/sources/gc-8.2.4/i
/* Feel free to add more clauses here */

/* Or manually define the machine type here. A machine type is */
diff -urN ./gc-8.2.4/minimal.diff /home/ahgamut/sources/gc-8.2.4/minimal.diff
--- ./gc-8.2.4/minimal.diff 1970-01-01 00:00:00.000000000 +0000
+++ - 2023-11-09 06:48:38.306106292 +0000
@@ -0,0 +1,34 @@
+diff -urN ./gc-8.2.4/configure /home/ahgamut/sources/gc-8.2.4/configure
+--- ./gc-8.2.4/configure 2023-05-26 18:57:16.000000000 +0000
++++ - 2023-11-09 05:30:07.671209178 +0000
+@@ -17184,7 +17184,7 @@
+ # We should set -fexceptions if we are using gcc and might be used
+ # inside something like gcj. This is the zeroth approximation:
+ if test :"$GCC": = :yes: ; then
+- gc_cflags="${gc_cflags} -fexceptions"
++ gc_cflags="${gc_cflags} "
+ else
+ case "$host" in
+ hppa*-*-hpux* )
+diff -urN ./gc-8.2.4/include/private/gcconfig.h /home/ahgamut/sources/gc-8.2.4/include/private/gcconfig.h
+--- ./gc-8.2.4/include/private/gcconfig.h 2023-05-26 18:56:18.000000000 +0000
++++ - 2023-11-09 05:30:49.391450600 +0000
+@@ -712,6 +712,18 @@
+ # define mach_type_known
+ # endif
+
++#if defined(__COSMOPOLITAN__)
++#if defined(__x86_64__)
++#define mach_type_known
++#define X86_64
++#define LINUX // optional?
++#elif defined(__aarch64__)
++#define mach_type_known
++#define AARCH64
++#define LINUX // optional?
++#endif
++#endif
++
+ /* Feel free to add more clauses here */
+
+ /* Or manually define the machine type here. A machine type is */
diff -urN ./gc-8.2.4/os_dep.c /home/ahgamut/sources/gc-8.2.4/os_dep.c
--- ./gc-8.2.4/os_dep.c 2023-05-26 18:56:18.000000000 +0000
+++ - 2023-11-09 06:47:00.268139541 +0000
+++ ./gc-8.2.4/os_dep.c 2023-11-09 06:47:00.268139541 +0000
@@ -1088,7 +1088,7 @@

#endif /* HPUX_STACK_BOTTOM */
Expand Down

1 comment on commit 39905b0

@ivmai
Copy link

@ivmai ivmai commented on 39905b0 Oct 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have upstream this change to master branch with some refactoring: 4920ad4 (see ivmai/bdwgc#666 for details)

Please sign in to comment.