authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-20 12:59:37-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-20 12:59:37-04:00
log245dc9d930a4f11a7ce719d3b9aa272a6a1127ff
treefa19e9ca728f987450885d56a42bf8272cce04e4
parent541e763010403d8233a6420756a1e8393f1dd4c2
signature Commit is signed but in an unrecognized format.

include ld symbols when generating glibc dummy objects

closes #4748

3 files changed, 160 insertions(+), 13 deletions(-)

lib/libc/glibc/abi.txt+135
......@@ -193,6 +193,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
193193
194194
19519529
196
19619729
197198
19819929
......@@ -514,6 +515,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
51451529
51551629
51651729
51829
517519
51852029
519521
......@@ -697,6 +699,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
69769929
69870029
69970129
702
70070329
70170429
70270529
......@@ -819,6 +822,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
81982229
82082329
82182429
82529
822826
82382729
82482829
......@@ -904,6 +908,9 @@ aarch64-linux-gnu aarch64_be-linux-gnu
90490829
90590929
90691029
91129
912
913
90791429
90891529
90991629
......@@ -1004,6 +1011,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
1004101129
1005101229
1006101329
101429
10071015
1008101629
1009101729
......@@ -1033,6 +1041,7 @@ aarch64-linux-gnu aarch64_be-linux-gnu
1033104129
1034104229
1035104329
104429
10361045
1037104629
1038104729
......@@ -3920,6 +3929,7 @@ s390x-linux-gnu
39203929
39213930
392239315
3932
3923393327
39243934
3925393527
......@@ -4241,6 +4251,7 @@ s390x-linux-gnu
424142515
424242525
424342535
42545
4244425511
4245425627
42464257
......@@ -4424,6 +4435,7 @@ s390x-linux-gnu
4424443519
4425443619
442644375
4438
442744395
442844405
4429444128
......@@ -4543,6 +4555,7 @@ s390x-linux-gnu
4543455527
45444556
4545455716
4558
454645595
454745605
4548456115
......@@ -4631,6 +4644,9 @@ s390x-linux-gnu
4631464416
463246455
463346465
4647
4648
464912
463446505
463546515
463646525
......@@ -4731,6 +4747,7 @@ s390x-linux-gnu
473147475
473247485
473347495
47505
47344751
473547525
473647535
......@@ -4756,6 +4773,7 @@ s390x-linux-gnu
475647735
475747745
475847755
47765
4759477731 5
4760477824 5 12 16
4761477924 5 12 16
......@@ -7645,6 +7663,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
76457663
76467664
76477665
7666
76487667
76497668
7650766927
......@@ -7968,6 +7987,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
7968798716
7969798816
7970798916
799016
79717991
7972799227
79737993
......@@ -8151,6 +8171,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
8151817119
8152817219
8153817316
8174
8154817516
8155817616
8156817728
......@@ -8273,6 +8294,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
8273829416
8274829516
8275829616
829716
82768298
8277829916
8278830016
......@@ -8358,6 +8380,9 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
8358838016
8359838116
8360838216
838316
8384
8385
8361838616
8362838716
8363838816
......@@ -8458,6 +8483,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
8458848316
8459848416
8460848516
848616
84618487
8462848816
8463848916
......@@ -8484,6 +8510,7 @@ arm-linux-gnueabi armeb-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf
8484851016
8485851116
8486851216
851316
8487851424 16
8488851524 16
8489851616
......@@ -11374,6 +11401,7 @@ sparc-linux-gnu sparcel-linux-gnu
1137411401
1137511402
11376114030
11404
113771140527
1137811406
113791140727
......@@ -11693,6 +11721,7 @@ sparc-linux-gnu sparcel-linux-gnu
11693117210
11694117220
11695117231
117241
11696117250
11697117260
11698117273 11
......@@ -11878,6 +11907,7 @@ sparc-linux-gnu sparcel-linux-gnu
118781190719
118791190819
11880119090
11910
11881119110
11882119121
118831191328
......@@ -11997,6 +12027,7 @@ sparc-linux-gnu sparcel-linux-gnu
119971202733
1199812028
119991202916
12030
12000120315
12001120320
120021203315
......@@ -12085,6 +12116,9 @@ sparc-linux-gnu sparcel-linux-gnu
120851211616
12086121170
12087121180
1211912
12120
12121
12088121221
12089121231
12090121241
......@@ -12183,6 +12217,7 @@ sparc-linux-gnu sparcel-linux-gnu
12183122171
12184122181
12185122191
122201
12186122210
12187122220
1218812223
......@@ -12207,6 +12242,7 @@ sparc-linux-gnu sparcel-linux-gnu
12207122420
12208122430
12209122440
122450
12210122465
12211122470
12212122480
......@@ -15101,6 +15137,7 @@ sparcv9-linux-gnu
15101151375
15102151385
1510315139
15140
151041514127
1510515142
151061514327
......@@ -15422,6 +15459,7 @@ sparcv9-linux-gnu
15422154595
15423154605
15424154615
154625
154251546311
154261546427
1542715465
......@@ -15605,6 +15643,7 @@ sparcv9-linux-gnu
156051564319
156061564419
15607156455
15646
15608156475
15609156485
156101564928
......@@ -15724,6 +15763,7 @@ sparcv9-linux-gnu
157241576327
1572515764
157261576516
15766
15727157675
15728157685
157291576915
......@@ -15812,6 +15852,9 @@ sparcv9-linux-gnu
158121585216
15813158535
15814158545
1585512
15856
15857
15815158585
15816158595
15817158605
......@@ -15912,6 +15955,7 @@ sparcv9-linux-gnu
15912159555
15913159565
15914159575
159585
1591515959
15916159605
15917159615
......@@ -15938,6 +15982,7 @@ sparcv9-linux-gnu
15938159825
15939159835
15940159845
159855
159411598624 28 5 12 16
159421598724 28 5 12 16
15943159885 14
......@@ -18828,6 +18873,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
1882818873
1882918874
18830188750
18876
188311887727
1883218878
188331887927
......@@ -19147,6 +19193,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
19147191930
19148191940
19149191955
191965
19150191970
19151191980
191521919911
......@@ -19332,6 +19379,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
193321937919
193331938019
19334193810
19382
19335193830
19336193845
193371938528
......@@ -19450,6 +19498,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
194501949827
194511949927
1945219500
1950116
194531950216
19454195035
19455195040
......@@ -19539,6 +19588,9 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
195391958816
19540195890
19541195900
1959112
19592
19593
19542195945
19543195955
19544195965
......@@ -19637,6 +19689,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
19637196895
19638196905
19639196915
196925
19640196930
19641196940
19642196950
......@@ -19661,6 +19714,7 @@ mips64el-linux-gnuabi64 mips64-linux-gnuabi64
19661197140
19662197150
19663197160
197170
19664197185
19665197190
19666197200
......@@ -22555,6 +22609,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
2255522609
2255622610
22557226110
22612
225582261327
2255922614
225602261527
......@@ -22874,6 +22929,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
22874229290
22875229300
22876229315
229325
22877229330
22878229340
228792293511
......@@ -23059,6 +23115,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
230592311519
230602311619
23061231170
23118
23062231190
23063231205
230642312128
......@@ -23177,6 +23234,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
231772323427
231782323527
2317923236
2323716
231802323816
23181232395
23182232400
......@@ -23266,6 +23324,9 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
232662332416
23267233250
23268233260
2332712
23328
23329
23269233305
23270233315
23271233325
......@@ -23364,6 +23425,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
23364234255
23365234265
23366234275
234285
23367234290
23368234300
23369234310
......@@ -23388,6 +23450,7 @@ mips64el-linux-gnuabin32 mips64-linux-gnuabin32
23388234500
23389234510
23390234520
234530
23391234545
23392234550
23393234560
......@@ -26282,6 +26345,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
2628226345
2628326346
26284263470
26348
262852634927
2628626350
262872635127
......@@ -26601,6 +26665,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
26601266650
26602266660
26603266675
266685
26604266690
26605266700
266062667111
......@@ -26786,6 +26851,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
267862685119
267872685219
26788268530
26854
26789268550
26790268565
267912685728
......@@ -26904,6 +26970,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
269042697027
2690526971
2690626972
2697316
269072697416
26908269755
26909269760
......@@ -26993,6 +27060,9 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
269932706016
26994270610
26995270620
2706312
27064
27065
26996270665
26997270675
26998270685
......@@ -27091,6 +27161,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
27091271615
27092271625
27093271635
271645
27094271650
27095271660
27096271670
......@@ -27115,6 +27186,7 @@ mipsel-linux-gnueabihf mips-linux-gnueabihf
27115271860
27116271870
27117271880
271890
27118271905
27119271910
27120271920
......@@ -30009,6 +30081,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
3000930081
3001030082
30011300830
30084
300123008527
3001330086
300143008727
......@@ -30328,6 +30401,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
30328304010
30329304020
30330304035
304045
30331304050
30332304060
303333040711
......@@ -30513,6 +30587,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
305133058719
305143058819
30515305890
30590
30516305910
30517305925
305183059328
......@@ -30631,6 +30706,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
306313070627
3063230707
3063330708
3070916
306343071016
30635307115
30636307120
......@@ -30720,6 +30796,9 @@ mipsel-linux-gnueabi mips-linux-gnueabi
307203079616
30721307970
30722307980
3079912
30800
30801
30723308025
30724308035
30725308045
......@@ -30818,6 +30897,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
30818308975
30819308985
30820308995
309005
30821309010
30822309020
30823309030
......@@ -30842,6 +30922,7 @@ mipsel-linux-gnueabi mips-linux-gnueabi
30842309220
30843309230
30844309240
309250
30845309265
30846309270
30847309280
......@@ -33734,6 +33815,7 @@ x86_64-linux-gnu
3373433815
3373533816
3373633817
33818
3373733819
3373833820
337393382127
......@@ -34057,6 +34139,7 @@ x86_64-linux-gnu
340573413910
340583414010
340593414110
3414210
340603414311
340613414427
340623414536
......@@ -34240,6 +34323,7 @@ x86_64-linux-gnu
342403432319
342413432419
342423432510
34326
342433432710
342443432810
342453432928
......@@ -34359,6 +34443,7 @@ x86_64-linux-gnu
343593444327
3436034444
343613444516
34446
343623444710
343633444810
343643444915
......@@ -34447,6 +34532,9 @@ x86_64-linux-gnu
344473453216
344483453310
344493453410
3453512
34536
34537
344503453810
344513453910
344523454010
......@@ -34547,6 +34635,7 @@ x86_64-linux-gnu
345473463510
345483463610
345493463710
3463810
3455034639
345513464010
345523464110
......@@ -34573,6 +34662,7 @@ x86_64-linux-gnu
345733466210
345743466310
345753466410
3466510
345763466624 10 12 16
345773466724 10 12 16
345783466810 14
......@@ -37461,6 +37551,7 @@ x86_64-linux-gnux32
3746137551
3746237552
3746337553
37554
3746437555
3746537556
374663755728
......@@ -37784,6 +37875,7 @@ x86_64-linux-gnux32
377843787528
377853787628
377863787728
3787828
3778737879
377883788028
377893788136
......@@ -37967,6 +38059,7 @@ x86_64-linux-gnux32
379673805928
379683806028
379693806128
38062
379703806328
379713806428
379723806528
......@@ -38086,6 +38179,7 @@ x86_64-linux-gnux32
380863817928
3808738180
380883818128
38182
380893818328
380903818428
380913818528
......@@ -38174,6 +38268,9 @@ x86_64-linux-gnux32
381743826828
381753826928
381763827028
3827128
38272
38273
381773827428
381783827528
381793827628
......@@ -38274,6 +38371,7 @@ x86_64-linux-gnux32
382743837128
382753837228
382763837328
3837428
3827738375
382783837628
382793837728
......@@ -38303,6 +38401,7 @@ x86_64-linux-gnux32
383033840128
383043840228
383053840328
3840428
3830638405
383073840628
383083840728
......@@ -41190,6 +41289,7 @@ i386-linux-gnu
4119041289
4119141290
41192412910
4129212
411934129327
411944129436
411954129527
......@@ -41509,6 +41609,7 @@ i386-linux-gnu
41509416090
41510416100
41511416111
416121
41512416130
41513416140
41514416153 11
......@@ -41694,6 +41795,7 @@ i386-linux-gnu
416944179519
416954179619
41696417970
41798
41697417990
41698418001
416994180128
......@@ -41813,6 +41915,7 @@ i386-linux-gnu
418134191527
4181441916
418154191716
41918
41816419195
41817419200
418184192115
......@@ -41901,6 +42004,9 @@ i386-linux-gnu
419014200416
41902420050
41903420060
4200712
42008
42009
41904420101
41905420111
41906420121
......@@ -41999,6 +42105,7 @@ i386-linux-gnu
41999421051
42000421061
42001421071
421081
42002421090
42003421100
4200442111
......@@ -42023,6 +42130,7 @@ i386-linux-gnu
42023421300
42024421310
42025421320
421330
42026421345
42027421350
42028421360
......@@ -44915,6 +45023,7 @@ powerpc64le-linux-gnu
4491545023
4491645024
4491745025
45026
4491845027
4491945028
449204502929
......@@ -45238,6 +45347,7 @@ powerpc64le-linux-gnu
452384534729
452394534829
452404534929
4535029
4524145351
452424535229
452434535336
......@@ -45421,6 +45531,7 @@ powerpc64le-linux-gnu
454214553129
454224553229
454234553329
4553433
454244553529
454254553629
454264553729
......@@ -45540,6 +45651,7 @@ powerpc64le-linux-gnu
455404565129
4554145652
455424565329
45654
455434565529
455444565629
455454565729
......@@ -45628,6 +45740,9 @@ powerpc64le-linux-gnu
456284574029
456294574129
456304574229
4574329
4574432
45745
456314574629
456324574729
456334574829
......@@ -45728,6 +45843,7 @@ powerpc64le-linux-gnu
457284584329
457294584429
457304584529
4584629
4573145847
457324584829
457334584929
......@@ -45757,6 +45873,7 @@ powerpc64le-linux-gnu
457574587329
457584587429
457594587529
4587629
4576045877
457614587829
457624587929
......@@ -48642,6 +48759,7 @@ powerpc64-linux-gnu
4864248759
4864348760
4864448761
48762
4864548763
4864648764
486474876527
......@@ -48965,6 +49083,7 @@ powerpc64-linux-gnu
489654908312
489664908412
489674908512
4908612
4896849087
489694908827
4897049089
......@@ -49148,6 +49267,7 @@ powerpc64-linux-gnu
491484926719
491494926819
491504926912
4927033
491514927112
491524927212
491534927328
......@@ -49267,6 +49387,7 @@ powerpc64-linux-gnu
492674938727
4926849388
492694938916
49390
492704939112
492714939212
492724939315
......@@ -49355,6 +49476,9 @@ powerpc64-linux-gnu
493554947616
493564947712
493574947812
4947912
4948032
49481
493584948212
493594948312
493604948412
......@@ -49455,6 +49579,7 @@ powerpc64-linux-gnu
494554957912
494564958012
494574958112
4958212
4945849583
494594958412
494604958512
......@@ -49480,6 +49605,7 @@ powerpc64-linux-gnu
494804960512
494814960612
494824960712
4960812
494834960912 15
494844961024 12 16
494854961124 12 16
......@@ -52369,6 +52495,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
5236952495
5237052496
5237152497
52498
5237252499
5237352500
523745250127
......@@ -52690,6 +52817,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
52690528170
52691528180
52692528191
528201
52693528210
52694528220
52695528233 11
......@@ -52875,6 +53003,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
528755300319
528765300419
52877530050
5300633
52878530070
52879530081
528805300928
......@@ -52994,6 +53123,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
529945312327
529955312413
529965312516
53126
52997531275
52998531280
529995312915
......@@ -53082,6 +53212,9 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
530825321216
53083532130
53084532140
5321512
5321632
53217
53085532181
53086532191
53087532201
......@@ -53180,6 +53313,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
53180533131
53181533141
53182533151
533161
53183533170
53184533180
5318553319
......@@ -53204,6 +53338,7 @@ powerpc-linux-gnueabi powerpc-linux-gnueabihf
53204533380
53205533390
53206533400
533410
53207533425
53208533430
53209533440
lib/libc/glibc/fns.txt+9
......@@ -192,6 +192,7 @@ _Qp_uitoq c
192192_Qp_uxtoq c
193193_Qp_xtoq c
194194___brk_addr c
195___tls_get_addr ld
195196__acos_finite m
196197__acosf128_finite m
197198__acosf_finite m
......@@ -511,6 +512,7 @@ __libc_memalign c
511512__libc_pvalloc c
512513__libc_realloc c
513514__libc_sa_len c
515__libc_stack_end ld
514516__libc_start_main c
515517__libc_valloc c
516518__libpthread_version_placeholder pthread
......@@ -696,6 +698,7 @@ __open_2 c
696698__openat64_2 c
697699__openat_2 c
698700__overflow c
701__parse_hwcap_and_convert_at_platform ld
699702__pipe c
700703__poll c
701704__poll_chk c
......@@ -815,6 +818,7 @@ __sqrtf_finite m
815818__sqrtl_finite m
816819__sqrtsf2 c
817820__stack_chk_fail c
821__stack_chk_guard ld
818822__statfs c
819823__stpcpy c
820824__stpcpy_chk c
......@@ -903,6 +907,9 @@ __sysctl c
903907__syslog_chk c
904908__sysv_signal c
905909__timezone c
910__tls_get_addr ld
911__tls_get_addr_opt ld
912__tls_get_offset ld
906913__toascii_l c
907914__tolower_l c
908915__toupper_l c
......@@ -999,6 +1006,7 @@ __ynf128_finite m
9991006__ynf_finite m
10001007__ynl_finite m
10011008_authenticate c
1009_dl_mcount ld
10021010_dl_mcount_wrapper c
10031011_dl_mcount_wrapper_check c
10041012_environ c
......@@ -1024,6 +1032,7 @@ _pthread_cleanup_pop pthread
10241032_pthread_cleanup_pop_restore pthread
10251033_pthread_cleanup_push pthread
10261034_pthread_cleanup_push_defer pthread
1035_r_debug ld
10271036_res c
10281037_res_hconf c
10291038_rpc_dtablesize c
tools/update_glibc.zig+16-13
......@@ -20,6 +20,7 @@ const lib_names = [_][]const u8{
2020 "m",
2121 "pthread",
2222 "rt",
23 "ld",
2324};
2425
2526// fpu/nofpu are hardcoded elsewhere, based on .gnueabi/.gnueabihf with an exception for .arm
......@@ -154,22 +155,24 @@ pub fn main() !void {
154155 const fn_set = &target_funcs_gop.kv.value.list;
155156
156157 for (lib_names) |lib_name, lib_name_index| {
157 const basename = try fmt.allocPrint(allocator, "lib{}.abilist", .{lib_name});
158 const lib_prefix = if (std.mem.eql(u8, lib_name, "ld")) "" else "lib";
159 const basename = try fmt.allocPrint(allocator, "{}{}.abilist", .{ lib_prefix, lib_name });
158160 const abi_list_filename = blk: {
159 if (abi_list.targets[0].abi == .gnuabi64 and std.mem.eql(u8, lib_name, "c")) {
161 const is_c = std.mem.eql(u8, lib_name, "c");
162 const is_m = std.mem.eql(u8, lib_name, "m");
163 const is_ld = std.mem.eql(u8, lib_name, "ld");
164 if (abi_list.targets[0].abi == .gnuabi64 and (is_c or is_ld)) {
160165 break :blk try fs.path.join(allocator, &[_][]const u8{ prefix, abi_list.path, "n64", basename });
161 } else if (abi_list.targets[0].abi == .gnuabin32 and std.mem.eql(u8, lib_name, "c")) {
166 } else if (abi_list.targets[0].abi == .gnuabin32 and (is_c or is_ld)) {
162167 break :blk try fs.path.join(allocator, &[_][]const u8{ prefix, abi_list.path, "n32", basename });
163168 } else if (abi_list.targets[0].arch != .arm and
164169 abi_list.targets[0].abi == .gnueabihf and
165 (std.mem.eql(u8, lib_name, "c") or
166 (std.mem.eql(u8, lib_name, "m") and abi_list.targets[0].arch == .powerpc)))
170 (is_c or (is_m and abi_list.targets[0].arch == .powerpc)))
167171 {
168172 break :blk try fs.path.join(allocator, &[_][]const u8{ prefix, abi_list.path, "fpu", basename });
169173 } else if (abi_list.targets[0].arch != .arm and
170174 abi_list.targets[0].abi == .gnueabi and
171 (std.mem.eql(u8, lib_name, "c") or
172 (std.mem.eql(u8, lib_name, "m") and abi_list.targets[0].arch == .powerpc)))
175 (is_c or (is_m and abi_list.targets[0].arch == .powerpc)))
173176 {
174177 break :blk try fs.path.join(allocator, &[_][]const u8{ prefix, abi_list.path, "nofpu", basename });
175178 } else if (abi_list.targets[0].arch == .arm) {
......@@ -234,8 +237,8 @@ pub fn main() !void {
234237 const vers_txt_path = try fs.path.join(allocator, &[_][]const u8{ glibc_out_dir, "vers.txt" });
235238 const vers_txt_file = try fs.cwd().createFile(vers_txt_path, .{});
236239 defer vers_txt_file.close();
237 var buffered = std.io.BufferedOutStream(fs.File.WriteError).init(&vers_txt_file.outStream().stream);
238 const vers_txt = &buffered.stream;
240 var buffered = std.io.bufferedOutStream(vers_txt_file.outStream());
241 const vers_txt = buffered.outStream();
239242 for (global_ver_list) |name, i| {
240243 _ = global_ver_set.put(name, i) catch unreachable;
241244 try vers_txt.print("{}\n", .{name});
......@@ -246,8 +249,8 @@ pub fn main() !void {
246249 const fns_txt_path = try fs.path.join(allocator, &[_][]const u8{ glibc_out_dir, "fns.txt" });
247250 const fns_txt_file = try fs.cwd().createFile(fns_txt_path, .{});
248251 defer fns_txt_file.close();
249 var buffered = std.io.BufferedOutStream(fs.File.WriteError).init(&fns_txt_file.outStream().stream);
250 const fns_txt = &buffered.stream;
252 var buffered = std.io.bufferedOutStream(fns_txt_file.outStream());
253 const fns_txt = buffered.outStream();
251254 for (global_fn_list) |name, i| {
252255 const kv = global_fn_set.get(name).?;
253256 kv.value.index = i;
......@@ -277,8 +280,8 @@ pub fn main() !void {
277280 const abilist_txt_path = try fs.path.join(allocator, &[_][]const u8{ glibc_out_dir, "abi.txt" });
278281 const abilist_txt_file = try fs.cwd().createFile(abilist_txt_path, .{});
279282 defer abilist_txt_file.close();
280 var buffered = std.io.BufferedOutStream(fs.File.WriteError).init(&abilist_txt_file.outStream().stream);
281 const abilist_txt = &buffered.stream;
283 var buffered = std.io.bufferedOutStream(abilist_txt_file.outStream());
284 const abilist_txt = buffered.outStream();
282285
283286 // first iterate over the abi lists
284287 for (abi_lists) |*abi_list, abi_index| {