Skip to content

Commit 7f9ed6a

Browse files
MingcongBaiMingcongBai
committed
liblol: prepare for 0.1.9
- Bump glibc to 2.41 and rebase patches at AOSC-Tracking/glibc @ aosc/glibc-2.41-ow (HEAD: 886a89b575e4235d6d09cf1aa799ccb5e559aa8a). - Drop unused genspec script and related materials.
1 parent 5184397 commit 7f9ed6a

15 files changed

+136
-266
lines changed

‎autobuild/patches/glibc/0001-add-old-world-abi-compatibility.patch‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0e9cdfdfc8916c9672ecef98ec1b430171a518bd Mon Sep 17 00:00:00 2001
1+
From aae27fb12aca3fd2d04b067d168921d3cbd5fdb1 Mon Sep 17 00:00:00 2001
22
From: Miao Wang <[email protected]>
33
Date: Sat, 13 Jan 2024 03:23:48 +0800
44
Subject: [PATCH 01/11] add old world abi compatibility
@@ -18,10 +18,10 @@ Subject: [PATCH 01/11] add old world abi compatibility
1818
create mode 100644 sysdeps/unix/sysv/linux/loongarch/statx_cp.c
1919

2020
diff --git a/login/Makefile b/login/Makefile
21-
index 84563230..37ed7d54 100644
21+
index d6a9a6975e..46cbc2763e 100644
2222
--- a/login/Makefile
2323
+++ b/login/Makefile
24-
@@ -53,7 +53,7 @@ CFLAGS-tst-utmp-unsigned-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
24+
@@ -95,7 +95,7 @@ CFLAGS-tst-utmp-unsigned-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
2525
# Empty compatibility library for old binaries.
2626
extra-libs := libutil
2727
extra-libs-others := $(extra-libs)
@@ -30,7 +30,7 @@ index 84563230..37ed7d54 100644
3030
libutil-routines := libutil-compat
3131
libutil-shared-only-routines := libutil-compat
3232

33-
@@ -61,9 +61,9 @@ libutil-shared-only-routines := libutil-compat
33+
@@ -103,9 +103,9 @@ libutil-shared-only-routines := libutil-compat
3434
# link is not installed.
3535
install-lib-ldscripts = libutil.so
3636
$(inst_libdir)/libutil.so:
@@ -44,7 +44,7 @@ index 84563230..37ed7d54 100644
4444
include ../Rules
4545

4646
diff --git a/nptl/Versions b/nptl/Versions
47-
index 3221de89..a0df5497 100644
47+
index 3221de89d1..a0df5497ac 100644
4848
--- a/nptl/Versions
4949
+++ b/nptl/Versions
5050
@@ -533,3 +533,264 @@ ld {
@@ -313,7 +313,7 @@ index 3221de89..a0df5497 100644
313313
+ }
314314
+}
315315
diff --git a/scripts/firstversions.awk b/scripts/firstversions.awk
316-
index ccde4b59..16008b08 100644
316+
index ccde4b59b4..16008b0858 100644
317317
--- a/scripts/firstversions.awk
318318
+++ b/scripts/firstversions.awk
319319
@@ -27,9 +27,16 @@ function vers_compare (v1, v2)
@@ -335,7 +335,7 @@ index ccde4b59..16008b08 100644
335335
}
336336

337337
diff --git a/scripts/versions.awk b/scripts/versions.awk
338-
index ef1600bc..05df6d7c 100644
338+
index 3365218445..57ff62c524 100644
339339
--- a/scripts/versions.awk
340340
+++ b/scripts/versions.awk
341341
@@ -89,7 +89,7 @@ function ord(c) {
@@ -348,7 +348,7 @@ index ef1600bc..05df6d7c 100644
348348

349349
# Some targets do not set the ABI baseline for libdl. As a result,
350350
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
351-
index b6305014..b72751ef 100644
351+
index ca5311c41d..d0133505ad 100644
352352
--- a/sunrpc/Makefile
353353
+++ b/sunrpc/Makefile
354354
@@ -22,7 +22,7 @@ subdir := sunrpc
@@ -370,7 +370,7 @@ index b6305014..b72751ef 100644
370370
tests = tst-xdrmem tst-xdrmem2 tst-udp-error tst-udp-timeout \
371371
tst-udp-nonblocking tst-bug22542 tst-bug28768
372372
diff --git a/sysdeps/nptl/Makeconfig b/sysdeps/nptl/Makeconfig
373-
index 9b960e49..05eef0df 100644
373+
index b5f546bac1..4847f08584 100644
374374
--- a/sysdeps/nptl/Makeconfig
375375
+++ b/sysdeps/nptl/Makeconfig
376376
@@ -20,6 +20,7 @@
@@ -383,7 +383,7 @@ index 9b960e49..05eef0df 100644
383383
shared-thread-library =
384384
diff --git a/sysdeps/unix/sysv/linux/loongarch/Versions b/sysdeps/unix/sysv/linux/loongarch/Versions
385385
new file mode 100644
386-
index 00000000..6b3dd0d1
386+
index 0000000000..6b3dd0d12e
387387
--- /dev/null
388388
+++ b/sysdeps/unix/sysv/linux/loongarch/Versions
389389
@@ -0,0 +1,36 @@
@@ -424,7 +424,7 @@ index 00000000..6b3dd0d1
424424
+ }
425425
+}
426426
diff --git a/sysdeps/unix/sysv/linux/loongarch/shlib-versions b/sysdeps/unix/sysv/linux/loongarch/shlib-versions
427-
index 5f40e7f5..4f126b54 100644
427+
index 5f40e7f5ec..4f126b5494 100644
428428
--- a/sysdeps/unix/sysv/linux/loongarch/shlib-versions
429429
+++ b/sysdeps/unix/sysv/linux/loongarch/shlib-versions
430430
@@ -1,9 +1,2 @@
@@ -441,7 +441,7 @@ index 5f40e7f5..4f126b54 100644
441441
+libpthread=0 GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.3 GLIBC_2.2.4 GLIBC_2.2.6 GLIBC_2.3 GLIBC_2.3.2 GLIBC_2.3.3 GLIBC_2.3.4 GLIBC_2.4 GLIBC_2.5 GLIBC_2.6 GLIBC_2.7 GLIBC_2.8 GLIBC_2.9 GLIBC_2.10 GLIBC_2.11 GLIBC_2.12 GLIBC_2.13 GLIBC_2.14 GLIBC_2.15 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 GLIBC_2.19 GLIBC_2.20 GLIBC_2.21 GLIBC_2.22 GLIBC_2.23 GLIBC_2.24 GLIBC_2.25 GLIBC_2.26 GLIBC_2.27 GLIBC_2.28 GLIBC_2.36
442442
diff --git a/sysdeps/unix/sysv/linux/loongarch/statx_cp.c b/sysdeps/unix/sysv/linux/loongarch/statx_cp.c
443443
new file mode 100644
444-
index 00000000..3b57a461
444+
index 0000000000..3b57a461d1
445445
--- /dev/null
446446
+++ b/sysdeps/unix/sysv/linux/loongarch/statx_cp.c
447447
@@ -0,0 +1,4 @@
@@ -450,5 +450,5 @@ index 00000000..3b57a461
450450
+
451451
+#include <sysdeps/unix/sysv/linux/statx_cp.c>
452452
--
453-
2.43.0
453+
2.48.1
454454

‎autobuild/patches/glibc/0002-add-sigset-ops.patch‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 21a31d92dbe61cf507772c1daea01f78f3c03c98 Mon Sep 17 00:00:00 2001
1+
From 994b535602703046266f3003d6aa57116700a64b Mon Sep 17 00:00:00 2001
22
From: Miao Wang <[email protected]>
33
Date: Sat, 13 Jan 2024 05:07:19 +0800
44
Subject: [PATCH 02/11] add sigset ops
@@ -44,7 +44,7 @@ Subject: [PATCH 02/11] add sigset ops
4444
create mode 100644 sysdeps/unix/sysv/linux/loongarch/sigorset.c
4545

4646
diff --git a/sysdeps/unix/sysv/linux/loongarch/Makefile b/sysdeps/unix/sysv/linux/loongarch/Makefile
47-
index c84a1762..70cac2d3 100644
47+
index c84a1762ed..70cac2d36c 100644
4848
--- a/sysdeps/unix/sysv/linux/loongarch/Makefile
4949
+++ b/sysdeps/unix/sysv/linux/loongarch/Makefile
5050
@@ -2,6 +2,19 @@ ifeq ($(subdir),stdlib)
@@ -69,7 +69,7 @@ index c84a1762..70cac2d3 100644
6969
ifeq (,$(filter $(default-abi),$(abi-variants)))
7070
diff --git a/sysdeps/unix/sysv/linux/loongarch/bits/signum-arch.h b/sysdeps/unix/sysv/linux/loongarch/bits/signum-arch.h
7171
new file mode 100644
72-
index 00000000..522f0846
72+
index 0000000000..522f084657
7373
--- /dev/null
7474
+++ b/sysdeps/unix/sysv/linux/loongarch/bits/signum-arch.h
7575
@@ -0,0 +1,6 @@
@@ -81,7 +81,7 @@ index 00000000..522f0846
8181
+#endif
8282
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigaddset.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigaddset.c
8383
new file mode 100644
84-
index 00000000..0bc18cda
84+
index 0000000000..0bc18cdaa1
8585
--- /dev/null
8686
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigaddset.c
8787
@@ -0,0 +1,11 @@
@@ -98,7 +98,7 @@ index 00000000..0bc18cda
9898
+#endif
9999
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigandset.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigandset.c
100100
new file mode 100644
101-
index 00000000..b28cfc23
101+
index 0000000000..b28cfc23f1
102102
--- /dev/null
103103
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigandset.c
104104
@@ -0,0 +1,11 @@
@@ -115,7 +115,7 @@ index 00000000..b28cfc23
115115
+#endif
116116
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigdelset.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigdelset.c
117117
new file mode 100644
118-
index 00000000..d29dc885
118+
index 0000000000..d29dc88570
119119
--- /dev/null
120120
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigdelset.c
121121
@@ -0,0 +1,11 @@
@@ -132,7 +132,7 @@ index 00000000..d29dc885
132132
+#endif
133133
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigempty.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigempty.c
134134
new file mode 100644
135-
index 00000000..67d3176e
135+
index 0000000000..67d3176edf
136136
--- /dev/null
137137
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigempty.c
138138
@@ -0,0 +1,11 @@
@@ -149,7 +149,7 @@ index 00000000..67d3176e
149149
+#endif
150150
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigfillset.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigfillset.c
151151
new file mode 100644
152-
index 00000000..3d41cbf5
152+
index 0000000000..3d41cbf55c
153153
--- /dev/null
154154
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigfillset.c
155155
@@ -0,0 +1,11 @@
@@ -166,7 +166,7 @@ index 00000000..3d41cbf5
166166
+#endif
167167
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigisempty.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigisempty.c
168168
new file mode 100644
169-
index 00000000..b30cb1a2
169+
index 0000000000..b30cb1a286
170170
--- /dev/null
171171
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigisempty.c
172172
@@ -0,0 +1,11 @@
@@ -183,7 +183,7 @@ index 00000000..b30cb1a2
183183
+#endif
184184
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigismem.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigismem.c
185185
new file mode 100644
186-
index 00000000..21432e42
186+
index 0000000000..21432e423f
187187
--- /dev/null
188188
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigismem.c
189189
@@ -0,0 +1,11 @@
@@ -200,7 +200,7 @@ index 00000000..21432e42
200200
+#endif
201201
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigop.h b/sysdeps/unix/sysv/linux/loongarch/ow_sigop.h
202202
new file mode 100644
203-
index 00000000..f06836b8
203+
index 0000000000..f06836b852
204204
--- /dev/null
205205
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigop.h
206206
@@ -0,0 +1,8 @@
@@ -214,7 +214,7 @@ index 00000000..f06836b8
214214
+extern int __ow_sigorset (sigset_t *__set, const sigset_t *__left, const sigset_t *__right);
215215
diff --git a/sysdeps/unix/sysv/linux/loongarch/ow_sigorset.c b/sysdeps/unix/sysv/linux/loongarch/ow_sigorset.c
216216
new file mode 100644
217-
index 00000000..8e73662b
217+
index 0000000000..8e73662b68
218218
--- /dev/null
219219
+++ b/sysdeps/unix/sysv/linux/loongarch/ow_sigorset.c
220220
@@ -0,0 +1,11 @@
@@ -231,7 +231,7 @@ index 00000000..8e73662b
231231
+#endif
232232
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigaddset.c b/sysdeps/unix/sysv/linux/loongarch/sigaddset.c
233233
new file mode 100644
234-
index 00000000..d86362d1
234+
index 0000000000..d86362d17c
235235
--- /dev/null
236236
+++ b/sysdeps/unix/sysv/linux/loongarch/sigaddset.c
237237
@@ -0,0 +1,11 @@
@@ -248,7 +248,7 @@ index 00000000..d86362d1
248248
+libc_hidden_ver(__nw_sigaddset, sigaddset)
249249
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigandset.c b/sysdeps/unix/sysv/linux/loongarch/sigandset.c
250250
new file mode 100644
251-
index 00000000..e3345db8
251+
index 0000000000..e3345db85f
252252
--- /dev/null
253253
+++ b/sysdeps/unix/sysv/linux/loongarch/sigandset.c
254254
@@ -0,0 +1,7 @@
@@ -261,7 +261,7 @@ index 00000000..e3345db8
261261
+versioned_symbol(libc, __nw_sigandset, sigandset, GLIBC_2_36);
262262
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigdelset.c b/sysdeps/unix/sysv/linux/loongarch/sigdelset.c
263263
new file mode 100644
264-
index 00000000..13e9c950
264+
index 0000000000..13e9c950d7
265265
--- /dev/null
266266
+++ b/sysdeps/unix/sysv/linux/loongarch/sigdelset.c
267267
@@ -0,0 +1,11 @@
@@ -278,7 +278,7 @@ index 00000000..13e9c950
278278
+libc_hidden_ver(__nw_sigdelset, sigdelset)
279279
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigempty.c b/sysdeps/unix/sysv/linux/loongarch/sigempty.c
280280
new file mode 100644
281-
index 00000000..476756e6
281+
index 0000000000..476756e6e0
282282
--- /dev/null
283283
+++ b/sysdeps/unix/sysv/linux/loongarch/sigempty.c
284284
@@ -0,0 +1,11 @@
@@ -295,7 +295,7 @@ index 00000000..476756e6
295295
+libc_hidden_ver(__nw_sigemptyset, sigemptyset)
296296
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigfillset.c b/sysdeps/unix/sysv/linux/loongarch/sigfillset.c
297297
new file mode 100644
298-
index 00000000..2f55b866
298+
index 0000000000..2f55b8664c
299299
--- /dev/null
300300
+++ b/sysdeps/unix/sysv/linux/loongarch/sigfillset.c
301301
@@ -0,0 +1,11 @@
@@ -312,7 +312,7 @@ index 00000000..2f55b866
312312
+libc_hidden_ver(__nw_sigfillset, sigfillset)
313313
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigisempty.c b/sysdeps/unix/sysv/linux/loongarch/sigisempty.c
314314
new file mode 100644
315-
index 00000000..b6ea8b84
315+
index 0000000000..b6ea8b8454
316316
--- /dev/null
317317
+++ b/sysdeps/unix/sysv/linux/loongarch/sigisempty.c
318318
@@ -0,0 +1,7 @@
@@ -325,7 +325,7 @@ index 00000000..b6ea8b84
325325
+versioned_symbol(libc, __nw_sigisemptyset, sigisemptyset, GLIBC_2_36);
326326
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigismem.c b/sysdeps/unix/sysv/linux/loongarch/sigismem.c
327327
new file mode 100644
328-
index 00000000..ae7d9b62
328+
index 0000000000..ae7d9b624d
329329
--- /dev/null
330330
+++ b/sysdeps/unix/sysv/linux/loongarch/sigismem.c
331331
@@ -0,0 +1,7 @@
@@ -338,7 +338,7 @@ index 00000000..ae7d9b62
338338
+versioned_symbol(libc, __nw_sigismember, sigismember, GLIBC_2_36);
339339
diff --git a/sysdeps/unix/sysv/linux/loongarch/sigorset.c b/sysdeps/unix/sysv/linux/loongarch/sigorset.c
340340
new file mode 100644
341-
index 00000000..a49e3f4e
341+
index 0000000000..a49e3f4ee8
342342
--- /dev/null
343343
+++ b/sysdeps/unix/sysv/linux/loongarch/sigorset.c
344344
@@ -0,0 +1,7 @@
@@ -350,5 +350,5 @@ index 00000000..a49e3f4e
350350
+#undef sigorset
351351
+versioned_symbol(libc, __nw_sigorset, sigorset, GLIBC_2_36);
352352
--
353-
2.43.0
353+
2.48.1
354354

0 commit comments

Comments
 (0)