Conan_Kudo / build / midipix_build

Forked from build/midipix_build 4 years ago
Clone

cd4df3 patches/bdwgc.local.patch: updated to match HEAD.

Authored and Committed by Lucio Andrés Illanes Albornoz 6 years ago
    patches/bdwgc.local.patch: updated to match HEAD.
    
        
file modified
+18 -18
patches/bdwgc.local.patch CHANGED
@@ -9,10 +9,10 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
9
9
+ || defined(SYMBIAN) || defined(MIDIPIX)
10
10
# include <fcntl.h>
11
11
#endif
12
-
13
- --- bdwgc/include/private/gcconfig.h.orig 2017-01-23 18:47:24.683963226 +0000
14
- +++ bdwgc/include/private/gcconfig.h 2017-01-23 18:58:19.917387539 +0000
15
- @@ -55,6 +55,10 @@
12
+
13
+ --- bdwgc/include/private/gcconfig.h.orig 2018-11-14 15:26:02.756000000 +0000
14
+ +++ bdwgc/include/private/gcconfig.h 2018-11-14 16:42:13.244000000 +0000
15
+ @@ -108,6 +108,10 @@
16
16
# define LINUX
17
17
# endif
18
18
@@ -23,7 +23,7 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
23
23
/* And one for QNX: */
24
24
# if defined(__QNX__)
25
25
# define I386
26
- @@ -293,6 +297,14 @@
26
+ @@ -362,6 +366,14 @@
27
27
# define X86_64
28
28
# define mach_type_known
29
29
# endif
@@ -38,8 +38,8 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
38
38
# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
39
39
# define IA64
40
40
# define mach_type_known
41
- @@ -1426,6 +1438,12 @@
42
- # include <gnu/libc-version.h> /* for gnu_get_libc_version() */
41
+ @@ -1542,6 +1554,12 @@
42
+ EXTERN_C_BEGIN
43
43
# endif
44
44
# endif
45
45
+# ifdef MIDIPIX
@@ -51,8 +51,8 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
51
51
# ifdef CYGWIN32
52
52
# define OS_TYPE "CYGWIN32"
53
53
# define DATASTART ((ptr_t)GC_DATASTART) /* From gc.h */
54
- @@ -2439,6 +2457,12 @@
55
- # include <gnu/libc-version.h> /* for gnu_get_libc_version() */
54
+ @@ -2656,6 +2674,12 @@
55
+ EXTERN_C_BEGIN
56
56
# endif
57
57
# endif
58
58
+# ifdef MIDIPIX
@@ -64,15 +64,15 @@ diff -ru bdwgc.orig/os_dep.c bdwgc/os_dep.c
64
64
# ifdef DARWIN
65
65
# define OS_TYPE "DARWIN"
66
66
# define DARWIN_DONT_PARSE_STACK
67
- @@ -2953,7 +2977,7 @@
68
- #if defined(GC_IRIX_THREADS) && !defined(IRIX5)
69
- # error --> inconsistent configuration
70
- #endif
71
- -#if defined(GC_LINUX_THREADS) && !defined(LINUX) && !defined(NACL)
72
- +#if defined(GC_LINUX_THREADS) && !defined(LINUX) && !defined(NACL) && !defined(MIDIPIX)
73
- # error --> inconsistent configuration
74
- #endif
75
- #if defined(GC_NETBSD_THREADS) && !defined(NETBSD)
67
+ @@ -3242,7 +3266,7 @@
68
+ # if defined(GC_IRIX_THREADS) && !defined(IRIX5)
69
+ # error Inconsistent configuration
70
+ # endif
71
+ -# if defined(GC_LINUX_THREADS) && !defined(LINUX) && !defined(NACL)
72
+ +# if defined(GC_LINUX_THREADS) && !defined(LINUX) && !defined(NACL) && !defined(MIDIPIX)
73
+ # error Inconsistent configuration
74
+ # endif
75
+ # if defined(GC_NETBSD_THREADS) && !defined(NETBSD)
76
76
--- bdwgc/pthread_stop_world.c.orig 2017-01-23 18:47:24.683963226 +0000
77
77
+++ bdwgc/pthread_stop_world.c 2017-01-23 18:59:56.449597256 +0000
78
78
@@ -20,6 +20,10 @@