Skip to content

Commit 48d528c

Browse files
authored
Bridge more musl/glibc diffs in aarch64 (#140)
1 parent 02df9c8 commit 48d528c

File tree

1 file changed

+39
-3
lines changed

1 file changed

+39
-3
lines changed

build_env/alltypes.h.diff

+39-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,42 @@
1-
--- bits/alltypes.h 2023-11-06 11:49:18.000000000 +0000
2-
+++ bits/alltypes.h 2024-04-22 09:30:09.927560000 +0000
3-
@@ -383,12 +383,20 @@
1+
--- bits/alltypes.h
2+
+++ bits/alltypes.h
3+
@@ -299,17 +299,32 @@
4+
#endif
5+
6+
#if defined(__NEED_pthread_mutexattr_t) && !defined(__DEFINED_pthread_mutexattr_t)
7+
-typedef struct { unsigned __attr; } pthread_mutexattr_t;
8+
+typedef struct { union { unsigned __attr;
9+
+#ifdef __aarch64__
10+
+ long __glibc_compat;
11+
+#endif
12+
+};
13+
+} pthread_mutexattr_t;
14+
#define __DEFINED_pthread_mutexattr_t
15+
#endif
16+
17+
#if defined(__NEED_pthread_condattr_t) && !defined(__DEFINED_pthread_condattr_t)
18+
-typedef struct { unsigned __attr; } pthread_condattr_t;
19+
+typedef struct { union { unsigned __attr;
20+
+#ifdef __aarch64__
21+
+ long __glibc_compat;
22+
+#endif
23+
+};
24+
+} pthread_condattr_t;
25+
#define __DEFINED_pthread_condattr_t
26+
#endif
27+
28+
#if defined(__NEED_pthread_barrierattr_t) && !defined(__DEFINED_pthread_barrierattr_t)
29+
-typedef struct { unsigned __attr; } pthread_barrierattr_t;
30+
+typedef struct { union { unsigned __attr;
31+
+#ifdef __aarch64__
32+
+ long __glibc_compat;
33+
+#endif
34+
+};
35+
+} pthread_barrierattr_t;
36+
#define __DEFINED_pthread_barrierattr_t
37+
#endif
38+
39+
@@ -383,12 +398,20 @@
440

541

642
#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)

0 commit comments

Comments
 (0)