forked from tpoechtrager/cctools-port
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.merge.log
842 lines (814 loc) · 35 KB
/
.merge.log
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
## cctools 877.8 -> 886 ##
patching file ./as/i386.c
patching file ./include/stuff/ofile.h
patching file ./libstuff/checkout.c
patching file ./libstuff/ofile.c
can't find file to patch at input line 290
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-877.8/Makefile ./Makefile
|--- ../cctools-877.8/Makefile 2016-01-03 10:19:07.000000000 +0100
|+++ ./Makefile 2016-05-02 04:22:30.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
23 out of 23 hunks ignored
The next patch would create the file ./man/llvm-otool.1,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file ./man/Makefile
patching file ./man/nm.1
The next patch would create the file ./man/nm-classic.1,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file ./man/otool-classic.1,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file ./man/size-classic.1,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file ./misc/bitcode_strip.c
patching file ./misc/codesign_allocate.c
Hunk #2 NOT MERGED at 288-307, merged at 312-313.
patching file ./misc/indr.c
Hunk #2 NOT MERGED at 567-586, merged at 591-592.
patching file ./misc/inout.c
Hunk #2 NOT MERGED at 159-178, merged at 183-184.
patching file ./misc/install_name_tool.c
patching file ./misc/libtool.c
Hunk #3 NOT MERGED at 271-275,279-283.
Hunk #11 already applied at 3901.
can't find file to patch at input line 1311
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-877.8/misc/Makefile ./misc/Makefile
|--- ../cctools-877.8/misc/Makefile 2015-03-10 01:33:19.000000000 +0100
|+++ ./misc/Makefile 2016-01-20 02:39:22.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
patching file ./misc/nm.c
Hunk #7 merged at 524-529.
patching file ./misc/seg_hack.c
Hunk #2 NOT MERGED at 219-238, merged at 243-244.
patching file ./misc/strip.c
Hunk #2 NOT MERGED at 911-930, merged at 935-936.
patching file ./otool/arm64_disasm.c
patching file ./otool/arm64_disasm.h
patching file ./otool/arm_disasm.c
patching file ./otool/dyld_bind_info.c
patching file ./otool/i386_disasm.c
patching file ./otool/i860_disasm.c
patching file ./otool/m68k_disasm.c
patching file ./otool/m88k_disasm.c
patching file ./otool/main.c
can't find file to patch at input line 2490
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-877.8/otool/Makefile ./otool/Makefile
|--- ../cctools-877.8/otool/Makefile 2015-03-10 01:33:19.000000000 +0100
|+++ ./otool/Makefile 2016-01-20 02:39:22.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
patching file ./otool/ofile_print.c
patching file ./otool/ofile_print.h
patching file ./otool/print_bitcode.c
Hunk #1 merged at 53-56,62-71,78-80.
patching file ./otool/print_objc2_64bit.c
patching file ./otool/sparc_disasm.c
# ld64 253.9 -> ld64 264.3.102 ##
patching file ./doc/man/man1/ld.1
can't find file to patch at input line 49
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-253.9/ld64.xcodeproj/project.pbxproj ./ld64.xcodeproj/project.pbxproj
|--- ../ld64-253.9/ld64.xcodeproj/project.pbxproj 2015-05-20 08:11:58.000000000 +0200
|+++ ./ld64.xcodeproj/project.pbxproj 2016-01-27 22:57:12.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
55 out of 55 hunks ignored
patching file ./src/abstraction/MachOTrie.hpp
Hunk #2 NOT MERGED at 388-392.
patching file ./src/ld/InputFiles.cpp
Hunk #2 NOT MERGED at 340-345.
patching file ./src/ld/InputFiles.h
patching file ./src/ld/ld.cpp
patching file ./src/ld/ld.hpp
patching file ./src/ld/LinkEditClassic.hpp
patching file ./src/ld/Options.cpp
Hunk #2 merged at 196-197,203-204.
Hunk #15 merged at 2970-2973,2981-2984,2989-2992,2996-2999,3005-3008,3013-3016.
patching file ./src/ld/Options.h
patching file ./src/ld/OutputFile.cpp
patching file ./src/ld/OutputFile.h
patching file ./src/ld/parsers/generic_dylib_file.hpp
patching file ./src/ld/parsers/lto_file.cpp
patching file ./src/ld/parsers/lto_file.h
patching file ./src/ld/parsers/macho_dylib_file.cpp
Hunk #1 NOT MERGED at 37-42, merged at 48, merged at 55, merged at 145, merged at 148-149, merged at 151.
patching file ./src/ld/parsers/macho_dylib_file.h
patching file ./src/ld/parsers/macho_relocatable_file.cpp
Hunk #13 merged at 4516,4518.
patching file ./src/ld/parsers/macho_relocatable_file.h
patching file ./src/ld/parsers/textstub_dylib_file.cpp
Hunk #1 merged at 37.
Hunk #2 NOT MERGED at 71-75.
Hunk #9 merged at 514,521,526, NOT MERGED at 529-533,536,542.
patching file ./src/ld/passes/bitcode_bundle.cpp
patching file ./src/ld/passes/branch_island.cpp
patching file ./src/ld/passes/branch_shim.cpp
patching file ./src/ld/passes/code_dedup.cpp
patching file ./src/ld/passes/code_dedup.h
patching file ./src/ld/passes/compact_unwind.cpp
patching file ./src/ld/passes/objc.cpp
patching file ./src/ld/passes/stubs/stubs.cpp
patching file ./src/ld/Resolver.cpp
patching file ./src/ld/SymbolTable.cpp
patching file ./src/ld/SymbolTable.h
patching file ./src/other/machochecker.cpp
Hunk #19 NOT MERGED at 602-606.
Hunk #20 NOT MERGED at 623-627.
patching file ./src/other/unwinddump.cpp
can't find file to patch at input line 6845
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-253.9/unit-tests/run-all-unit-tests ./unit-tests/run-all-unit-tests
|--- ../ld64-253.9/unit-tests/run-all-unit-tests 2013-03-08 00:10:19.000000000 +0100
|+++ ./unit-tests/run-all-unit-tests 2015-11-11 01:07:39.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file ./unit-tests/test-cases/linker-optimization-hints/AdrpLdrGotLdrField.s
can't find file to patch at input line 6914
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-253.9/unit-tests/test-cases/linker-optimization-hints/Makefile ./unit-tests/test-cases/linker-optimization-hints/Makefile
|--- ../ld64-253.9/unit-tests/test-cases/linker-optimization-hints/Makefile 2014-01-27 22:34:25.000000000 +0100
|+++ ./unit-tests/test-cases/linker-optimization-hints/Makefile 2015-11-11 01:07:39.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
5 out of 5 hunks ignored
patching file ./unit-tests/test-cases/linker_options-library-chain/bar.c
patching file ./unit-tests/test-cases/linker_options-library-chain/foo.c
patching file ./unit-tests/test-cases/linker_options-library-chain/main.c
patching file ./unit-tests/test-cases/linker_options-library-chain/Makefile
patching file ./unit-tests/test-cases/linker_options-library-chain/subbar.c
can't find file to patch at input line 7433
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-253.9/unit-tests/test-cases/objc-category-optimize/Makefile ./unit-tests/test-cases/objc-category-optimize/Makefile
|--- ../ld64-253.9/unit-tests/test-cases/objc-category-optimize/Makefile 2013-10-19 03:10:28.000000000 +0200
|+++ ./unit-tests/test-cases/objc-category-optimize/Makefile 2015-11-11 01:07:39.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 7460
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-253.9/unit-tests/test-cases/objc-category-optimize-load/Makefile ./unit-tests/test-cases/objc-category-optimize-load/Makefile
|--- ../ld64-253.9/unit-tests/test-cases/objc-category-optimize-load/Makefile 2013-10-19 03:10:28.000000000 +0200
|+++ ./unit-tests/test-cases/objc-category-optimize-load/Makefile 2015-11-11 01:07:39.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
--------------------------------------------------------------------------------------------------------------------------------------------------------------
## cctools 877.5 -> 877.8 ##
patching file include/mach-o/loader.h
patching file libstuff/execute.c
patching file libstuff/ofile.c
patching file libstuff/swap_headers.c
patching file misc/bitcode_strip.c
Hunk #11 NOT MERGED at 364-373, merged at 377, merged at 382-385.
Hunk #20 merged at 547-557.
patching file otool/main.c
patching file otool/ofile_print.c
## ld64 253.3 -> ld64 253.9 ##
patching file src/ld/InputFiles.cpp
patching file src/ld/ld.hpp
patching file src/ld/Options.cpp
Hunk #1 NOT MERGED at 194-205.
patching file src/ld/Options.h
patching file src/ld/parsers/lto_file.cpp
Hunk #1 merged at 324-325.
patching file src/ld/parsers/macho_dylib_file.cpp
patching file src/ld/parsers/macho_relocatable_file.cpp
patching file src/ld/parsers/macho_relocatable_file.h
patching file src/ld/parsers/textstub_dylib_file.cpp
patching file src/ld/passes/bitcode_bundle.cpp
patching file src/ld/Resolver.cpp
patching file src/other/ObjectDump.cpp
--------------------------------------------------------------------------------------------------------------------------------------------------------------
## cctools 870 -> 877.5 ##
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-870/Makefile ./Makefile
|--- ../cctools-870/Makefile 2015-08-26 07:49:15.000000000 +0200
|+++ ./Makefile 2015-09-15 03:35:14.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
patching file ./as/driver.c
patching file ./include/Makefile
patching file ./include/mach/arm/_structs.h
patching file ./include/mach-o/loader.h
patching file ./include/stuff/breakout.h
patching file ./include/stuff/bytesex.h
Hunk #1 succeeded at 59 (offset 5 lines).
Hunk #2 succeeded at 432 (offset 5 lines).
patching file ./include/xar/xar.h
patching file ./libstuff/bytesex.c
Hunk #1 succeeded at 209 (offset 5 lines).
Hunk #2 succeeded at 2910 (offset 5 lines).
patching file ./libstuff/checkout.c
patching file ./libstuff/lto.c
Hunk #2 succeeded at 139 (offset 11 lines).
Hunk #3 succeeded at 168 (offset 11 lines).
patching file ./libstuff/ofile.c
Hunk #1 succeeded at 4205 (offset 5 lines).
patching file ./libstuff/swap_headers.c
Hunk #1 succeeded at 1172 (offset 5 lines).
Hunk #2 succeeded at 1759 (offset 5 lines).
patching file ./man/Makefile
patching file ./man/as.1
patching file ./man/bitcode_strip.1
patching file ./man/otool.1
can't find file to patch at input line 892
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-870/misc/Makefile ./misc/Makefile
|--- ../cctools-870/misc/Makefile 2013-12-10 20:28:11.000000000 +0100
|+++ ./misc/Makefile 2015-03-10 01:33:19.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
7 out of 7 hunks ignored
patching file ./misc/bitcode_strip.c
patching file ./misc/codesign_allocate.c
Hunk #1 succeeded at 372 (offset 20 lines).
patching file ./misc/libtool.c
Hunk #1 succeeded at 211 (offset 3 lines).
Hunk #2 succeeded at 266 (offset 3 lines).
Hunk #3 succeeded at 1524 (offset 10 lines).
Hunk #4 succeeded at 2189 (offset 10 lines).
Hunk #5 succeeded at 2202 (offset 10 lines).
Hunk #6 succeeded at 2214 (offset 10 lines).
Hunk #7 succeeded at 3493 (offset 10 lines).
Hunk #8 succeeded at 3621 (offset 10 lines).
Hunk #9 succeeded at 3700 (offset 10 lines).
Hunk #10 succeeded at 3840 (offset 10 lines).
can't find file to patch at input line 2635
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-870/otool/Makefile ./otool/Makefile
|--- ../cctools-870/otool/Makefile 2014-01-14 01:21:55.000000000 +0100
|+++ ./otool/Makefile 2015-03-10 01:33:19.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file ./otool/main.c
Hunk #1 succeeded at 1511 (offset 4 lines).
Hunk #2 succeeded at 1553 (offset 4 lines).
patching file ./otool/ofile_print.c
Hunk #1 succeeded at 294 (offset 8 lines).
Hunk #2 succeeded at 2292 (offset 10 lines).
Hunk #3 succeeded at 3502 (offset 10 lines).
Hunk #4 succeeded at 7631 (offset 10 lines).
Hunk #5 succeeded at 7685 (offset 10 lines).
Hunk #6 succeeded at 7701 (offset 10 lines).
Hunk #7 succeeded at 7741 (offset 10 lines).
Hunk #8 succeeded at 7757 (offset 10 lines).
Hunk #9 succeeded at 7772 (offset 10 lines).
Hunk #10 succeeded at 7781 (offset 10 lines).
Hunk #11 succeeded at 7811 (offset 10 lines).
Hunk #12 succeeded at 7826 (offset 10 lines).
Hunk #13 succeeded at 8076 (offset 12 lines).
Hunk #14 succeeded at 8173 (offset 12 lines).
patching file ./otool/ofile_print.h
patching file ./otool/print_bitcode.c
patching file ./otool/print_objc2_32bit.c
patching file ./otool/print_objc2_64bit.c
## ld64 242.2 -> ld64 253.3 ##
patching file ./doc/man/man1/ld.1
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur '--exclude=unit-tests' ../ld64-242.2/ld64.xcodeproj/project.pbxproj ./ld64.xcodeproj/project.pbxproj
|--- ../ld64-242.2/ld64.xcodeproj/project.pbxproj 2014-08-20 00:19:03.000000000 +0200
|+++ ./ld64.xcodeproj/project.pbxproj 2015-05-20 08:11:58.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
22 out of 22 hunks ignored
patching file ./src/abstraction/MachOFileAbstraction.hpp
patching file ./src/create_configure
patching file ./src/ld/Bitcode.hpp
patching file ./src/ld/HeaderAndLoadCommands.hpp
patching file ./src/ld/InputFiles.cpp
Hunk #3 merged at 334.
Hunk #10 merged at 858, NOT MERGED at 861-870.
patching file ./src/ld/LinkEdit.hpp
patching file ./src/ld/LinkEditClassic.hpp
patching file ./src/ld/Options.cpp
Hunk #1 merged at 39-40, NOT MERGED at 47-54.
Hunk #18 NOT MERGED at 1958-1962.
patching file ./src/ld/Options.h
Hunk #13 merged at 481.
patching file ./src/ld/OutputFile.cpp
patching file ./src/ld/OutputFile.h
patching file ./src/ld/Resolver.cpp
patching file ./src/ld/Resolver.h
patching file ./src/ld/SymbolTable.cpp
patching file ./src/ld/SymbolTable.h
patching file ./src/ld/code-sign-blobs/memutils.h
Hunk #1 NOT MERGED at 56-66.
patching file ./src/ld/ld.cpp
patching file ./src/ld/ld.hpp
Hunk #1 merged at 35-36,38,45-47.
The next patch would delete the file ./src/ld/lto_file.hpp,
which does not exist! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file ./src/ld/parsers/lto_file.cpp
Hunk #1 merged at 39.
Hunk #9 NOT MERGED at 551-558.
patching file ./src/ld/parsers/lto_file.h
patching file ./src/ld/parsers/macho_dylib_file.cpp
patching file ./src/ld/parsers/macho_relocatable_file.cpp
Hunk #1 merged at 45,51.
patching file ./src/ld/parsers/macho_relocatable_file.h
patching file ./src/ld/parsers/opaque_section_file.cpp
patching file ./src/ld/parsers/textstub_dylib_file.cpp
patching file ./src/ld/parsers/textstub_dylib_file.hpp
patching file ./src/ld/passes/bitcode_bundle.cpp
patching file ./src/ld/passes/bitcode_bundle.h
patching file ./src/ld/passes/branch_island.cpp
Hunk #1 NOT MERGED at 555-559.
patching file ./src/ld/passes/branch_shim.cpp
patching file ./src/ld/passes/dylibs.cpp
patching file ./src/ld/passes/got.cpp
patching file ./src/ld/passes/huge.cpp
patching file ./src/ld/passes/objc.cpp
patching file ./src/ld/passes/order.cpp
patching file ./src/ld/passes/stubs/stub_arm.hpp
patching file ./src/ld/passes/stubs/stub_arm64.hpp
patching file ./src/ld/passes/stubs/stubs.cpp
patching file ./src/ld/passes/tlvp.cpp
patching file ./src/other/ObjectDump.cpp
patching file ./src/other/dyldinfo.cpp
Hunk #10 NOT MERGED at 1892-1895.
--------------------------------------------------------------------------------------------------------------------------------------------------------------
## ld64 242 -> ld64 242.2 ##
patching file ./src/ld/passes/branch_island.cpp
patching file ./src/ld/passes/compact_unwind.cpp
patching file ./src/ld/passes/got.cpp
can't find file to patch at input line 214
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-242/unit-tests/test-cases/branch-islands/space.s ./unit-tests/test-cases/branch-islands/space.s
|--- ../ld64-242/unit-tests/test-cases/branch-islands/space.s 2013-10-19 03:10:28.000000000 +0200
|+++ ./unit-tests/test-cases/branch-islands/space.s 2015-05-05 21:42:23.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
--------------------------------------------------------------------------------------------------------------------------------------------------------------
## cctools 862 -> 870 ##
patching file ./as/arm.c
Hunk #1 NOT MERGED at 17844-17848. # Has already been fixed in my repo.
Hunk #2 NOT MERGED at 17893-17897. # Has already been fixed in my repo.
Hunk #3 NOT MERGED at 17940-17944. # Has already been fixed in my repo.
Hunk #4 NOT MERGED at 17988-17992. # Has already been fixed in my repo.
patching file ./as/driver.c
Hunk #1 already applied at 64. # Has already been fixed in my repo.
patching file ./include/mach-o/loader.h
patching file ./include/mach-o/stab.h
can't find file to patch at input line 86
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-862/libmacho/Makefile ./libmacho/Makefile
|--- ../cctools-862/libmacho/Makefile 2014-11-02 06:48:07.000000000 +0100
|+++ ./libmacho/Makefile 2015-01-08 03:29:57.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y] y
Skipping patch.
10 out of 10 hunks ignored
can't find file to patch at input line 247
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-862/libmacho/arch.c ./libmacho/arch.c
|--- ../cctools-862/libmacho/arch.c 2014-11-02 06:48:07.000000000 +0100
|+++ ./libmacho/arch.c 2014-09-29 23:48:52.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 274
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-862/libmacho/getsecbyname.c ./libmacho/getsecbyname.c
|--- ../cctools-862/libmacho/getsecbyname.c 2014-11-02 06:48:07.000000000 +0100
|+++ ./libmacho/getsecbyname.c 2015-01-08 03:29:57.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
10 out of 10 hunks ignored
patching file ./libstuff/arch.c
patching file ./libstuff/ofile.c
patching file ./libstuff/swap_headers.c
patching file ./man/otool.1
patching file ./misc/codesign_allocate.c
patching file ./misc/install_name_tool.c
patching file ./misc/libtool.c
Hunk #1 NOT MERGED at 1375-1385. # Resolved. Also something I already had fixed in my repo, but not 100% correctly.
patching file ./misc/lipo.c
patching file ./misc/nm.c
patching file ./otool/arm64_disasm.c
patching file ./otool/arm_disasm.c
patching file ./otool/i386_disasm.c
patching file ./otool/main.c
patching file ./otool/ofile_print.c
patching file ./otool/ofile_print.h
patching file ./otool/otool.h
patching file ./otool/print_objc2_32bit.c
patching file ./otool/print_objc2_64bit.c
## ld64 241.9 -> ld64 242 ##
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was: # I do not support buildig with Xcode.
--------------------------
|diff -Naur ../ld64-241.9/ld64.xcodeproj/project.pbxproj ./ld64.xcodeproj/project.pbxproj
|--- ../ld64-241.9/ld64.xcodeproj/project.pbxproj 2014-11-04 00:58:03.000000000 +0100
|+++ ./ld64.xcodeproj/project.pbxproj 2014-08-20 00:19:03.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
7 out of 7 hunks ignored
patching file ./src/abstraction/MachOFileAbstraction.hpp
Hunk #1 NOT MERGED at 257-276. # Has already been fixed in my repo, but in a little different way.
patching file ./src/create_configure
patching file ./src/ld/InputFiles.cpp
patching file ./src/ld/Options.cpp
patching file ./src/ld/Options.h
patching file ./src/ld/Resolver.cpp
patching file ./src/ld/ld.hpp
patching file ./src/ld/parsers/libunwind/DwarfInstructions.hpp
patching file ./src/ld/parsers/lto_file.cpp
Hunk #2 NOT MERGED at 499-507. # Resolved.
patching file ./src/ld/parsers/lto_file.h
patching file ./src/ld/parsers/macho_relocatable_file.cpp
Hunk #8 merged at 4219-4234.
patching file ./src/ld/parsers/macho_relocatable_file.h
patching file ./src/ld/passes/compact_unwind.cpp
patching file ./src/other/ObjectDump.cpp
patching file ./src/other/unwinddump.cpp
--------------------------------------------------------------------------------------------------------------------------------------------------------------
## cctools 855 -> 862 ##
patching file efitools/mtoc.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file efitools/mtoc.c.rej
patching file include/llvm-c/Disassembler.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/llvm-c/Disassembler.h.rej
patching file include/mach-o/loader.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/mach-o/loader.h.rej
patching file include/mach-o/nlist.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/mach-o/nlist.h.rej
patching file include/stuff/llvm.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/stuff/llvm.h.rej
can't find file to patch at input line 103
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../cctools-855/libmacho/arch.c ./libmacho/arch.c
|--- ../cctools-855/libmacho/arch.c 2014-04-05 00:42:22.000000000 +0200
|+++ ./libmacho/arch.c 2014-11-02 06:48:07.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file libstuff/checkout.c
patching file libstuff/llvm.c
Hunk #1 succeeded at 27 (offset 1 line).
Hunk #2 succeeded at 69 with fuzz 1 (offset -2 lines).
Hunk #3 succeeded at 78 (offset -2 lines).
Hunk #4 succeeded at 93 (offset -2 lines).
Hunk #5 succeeded at 183 (offset -2 lines).
patching file libstuff/ofile.c
patching file man/as.1
patching file man/libtool.1
patching file man/otool.1
patching file misc/libtool.c
Hunk #1 succeeded at 149 (offset 2 lines).
Hunk #2 succeeded at 977 (offset -2 lines).
Hunk #3 succeeded at 1269 (offset -2 lines).
patching file misc/lipo.c
patching file misc/nm.c
patching file misc/strip.c
patching file otool/arm_disasm.c
patching file otool/i386_disasm.c
patching file otool/main.c
Hunk #2 succeeded at 330 with fuzz 1.
Hunk #4 succeeded at 561 (offset 1 line).
Hunk #5 succeeded at 577 (offset 1 line).
Hunk #6 succeeded at 619 (offset 1 line).
Hunk #7 succeeded at 656 (offset 1 line).
Hunk #8 succeeded at 3193 (offset 1 line).
Hunk #9 succeeded at 3207 (offset 1 line).
patching file otool/ofile_print.c
patching file otool/print_objc2_32bit.c
patching file otool/print_objc2_64bit.c
## ld64 236.3 -> 241.9 ##
patching file doc/man/man1/ld.1
can't find file to patch at input line 66
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/ld64.xcodeproj/project.pbxproj ./ld64.xcodeproj/project.pbxproj
|--- ../ld64-236.3/ld64.xcodeproj/project.pbxproj 2014-04-05 00:42:29.000000000 +0200
|+++ ./ld64.xcodeproj/project.pbxproj 2014-11-04 00:58:03.000000000 +0100
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
patching file src/abstraction/MachOFileAbstraction.hpp
Hunk #3 succeeded at 374 (offset 4 lines).
Hunk #4 succeeded at 446 (offset 4 lines).
patching file src/ld/HeaderAndLoadCommands.hpp
Hunk #1 succeeded at 600 (offset 9 lines).
Hunk #2 succeeded at 761 (offset 9 lines).
patching file src/ld/InputFiles.cpp
Hunk #1 succeeded at 257 (offset 2 lines).
Hunk #2 succeeded at 314 with fuzz 1 (offset 4 lines).
Hunk #3 succeeded at 381 with fuzz 2 (offset 6 lines).
Hunk #4 succeeded at 576 (offset 6 lines).
Hunk #5 succeeded at 592 (offset 6 lines).
Hunk #6 succeeded at 613 (offset 6 lines).
Hunk #7 succeeded at 627 (offset 6 lines).
Hunk #8 succeeded at 943 (offset 8 lines).
Hunk #9 succeeded at 1178 (offset 8 lines).
Hunk #10 succeeded at 1327 (offset 8 lines).
Hunk #11 succeeded at 1369 (offset 8 lines).
patching file src/ld/InputFiles.h
patching file src/ld/ld.cpp
Hunk #1 succeeded at 108 (offset 2 lines).
Hunk #2 succeeded at 120 (offset 2 lines).
Hunk #3 succeeded at 184 (offset 2 lines).
Hunk #4 succeeded at 200 (offset 2 lines).
Hunk #5 succeeded at 238 (offset 2 lines).
Hunk #6 succeeded at 254 (offset 2 lines).
Hunk #7 succeeded at 305 (offset 2 lines).
Hunk #8 succeeded at 365 (offset 2 lines).
Hunk #9 succeeded at 375 (offset 2 lines).
Hunk #10 succeeded at 496 (offset 2 lines).
Hunk #11 succeeded at 594 (offset 2 lines).
Hunk #12 succeeded at 616 (offset 2 lines).
Hunk #13 succeeded at 647 (offset 2 lines).
Hunk #14 succeeded at 898 (offset 2 lines).
Hunk #15 succeeded at 927 (offset 2 lines).
patching file src/ld/ld.hpp
Hunk #1 succeeded at 147 (offset 1 line).
Hunk #2 succeeded at 168 (offset 1 line).
Hunk #3 succeeded at 272 (offset 1 line).
Hunk #4 succeeded at 316 (offset 1 line).
Hunk #5 succeeded at 532 (offset 1 line).
Hunk #6 succeeded at 545 (offset 1 line).
Hunk #7 succeeded at 575 (offset 1 line).
Hunk #8 succeeded at 586 (offset 1 line).
Hunk #9 succeeded at 757 (offset 1 line).
Hunk #10 succeeded at 775 (offset 1 line).
Hunk #11 succeeded at 859 (offset 1 line).
Hunk #12 succeeded at 879 (offset 1 line).
patching file src/ld/LinkEditClassic.hpp
patching file src/ld/Options.cpp
Hunk #1 succeeded at 134 (offset 7 lines).
Hunk #2 succeeded at 183 (offset 7 lines).
Hunk #3 succeeded at 547 (offset 7 lines).
Hunk #4 succeeded at 1031 (offset 7 lines).
Hunk #5 succeeded at 1793 (offset 7 lines).
Hunk #6 succeeded at 3001 (offset 11 lines).
Hunk #7 succeeded at 3060 (offset 11 lines).
Hunk #8 succeeded at 3440 (offset 13 lines).
Hunk #9 succeeded at 3911 (offset 13 lines).
Hunk #10 succeeded at 4039 (offset 13 lines).
Hunk #11 succeeded at 4076 (offset 13 lines).
Hunk #12 succeeded at 4130 (offset 13 lines).
Hunk #13 succeeded at 4166 (offset 13 lines).
Hunk #14 succeeded at 4281 (offset 13 lines).
Hunk #15 succeeded at 4301 (offset 13 lines).
Hunk #16 succeeded at 4769 (offset 13 lines).
patching file src/ld/Options.h
patching file src/ld/OutputFile.cpp
Hunk #11 succeeded at 2857 (offset 6 lines).
Hunk #12 succeeded at 4587 (offset 6 lines).
Hunk #13 succeeded at 4659 (offset 6 lines).
Hunk #14 succeeded at 4734 (offset 6 lines).
Hunk #15 succeeded at 4760 (offset 6 lines).
Hunk #16 succeeded at 4946 (offset 6 lines).
patching file src/ld/parsers/libunwind/DwarfInstructions.hpp
patching file src/ld/parsers/libunwind/DwarfParser.hpp
patching file src/ld/parsers/libunwind/Registers.hpp
Hunk #1 succeeded at 1325 (offset 8 lines).
patching file src/ld/parsers/lto_file.cpp
Hunk #1 succeeded at 79 (offset 5 lines).
Hunk #2 succeeded at 113 (offset 5 lines).
Hunk #3 succeeded at 234 (offset 5 lines).
Hunk #4 succeeded at 307 (offset 5 lines).
Hunk #5 succeeded at 338 (offset 5 lines).
Hunk #6 succeeded at 425 (offset 5 lines).
Hunk #7 succeeded at 455 (offset 5 lines).
Hunk #8 succeeded at 488 (offset 5 lines).
Hunk #9 succeeded at 538 (offset 5 lines).
Hunk #10 succeeded at 584 (offset 5 lines).
Hunk #11 succeeded at 644 (offset 5 lines).
Hunk #12 succeeded at 757 (offset 5 lines).
Hunk #13 succeeded at 798 (offset 5 lines).
Hunk #14 succeeded at 850 (offset 5 lines).
patching file src/ld/parsers/lto_file.h
patching file src/ld/parsers/macho_dylib_file.cpp
Hunk #10 FAILED at 1088.
1 out of 10 hunks FAILED -- saving rejects to file src/ld/parsers/macho_dylib_file.cpp.rej
patching file src/ld/parsers/macho_relocatable_file.cpp
patching file src/ld/passes/branch_island.cpp
patching file src/ld/passes/compact_unwind.cpp
patching file src/ld/passes/objc.cpp
patching file src/ld/passes/order.cpp
patching file src/ld/Resolver.cpp
Hunk #7 succeeded at 1550 (offset 1 line).
Hunk #8 succeeded at 1581 (offset 1 line).
Hunk #9 succeeded at 1684 (offset 4 lines).
patching file src/ld/Resolver.h
patching file src/ld/SymbolTable.cpp
patching file src/other/ObjectDump.cpp
Hunk #1 succeeded at 835 (offset 4 lines).
Hunk #2 FAILED at 996.
Hunk #3 succeeded at 1016 (offset 7 lines).
1 out of 3 hunks FAILED -- saving rejects to file src/other/ObjectDump.cpp.rej
patching file src/other/unwinddump.cpp
can't find file to patch at input line 3517
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/unit-tests/include/common.makefile ./unit-tests/include/common.makefile
|--- ../ld64-236.3/unit-tests/include/common.makefile 2014-04-05 00:42:29.000000000 +0200
|+++ ./unit-tests/include/common.makefile 2014-09-11 00:24:46.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
patching file unit-tests/test-cases/alias-basic/aliases.s
patching file unit-tests/test-cases/alias-basic/main.c
patching file unit-tests/test-cases/alias-basic/Makefile
can't find file to patch at input line 3639
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/unit-tests/test-cases/alias-objects/aliases.s ./unit-tests/test-cases/alias-objects/aliases.s
|--- ../ld64-236.3/unit-tests/test-cases/alias-objects/aliases.s 2014-04-05 00:42:29.000000000 +0200
|+++ ./unit-tests/test-cases/alias-objects/aliases.s 2014-09-11 00:24:46.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 3668
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/unit-tests/test-cases/alias-objects/Makefile ./unit-tests/test-cases/alias-objects/Makefile
|--- ../ld64-236.3/unit-tests/test-cases/alias-objects/Makefile 2014-04-05 00:42:29.000000000 +0200
|+++ ./unit-tests/test-cases/alias-objects/Makefile 2014-09-11 00:24:46.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
patching file unit-tests/test-cases/alt-entry/foo.c
patching file unit-tests/test-cases/alt-entry/main.c
patching file unit-tests/test-cases/alt-entry/Makefile
patching file unit-tests/test-cases/lto-r/bar.c
patching file unit-tests/test-cases/lto-r/foo.c
patching file unit-tests/test-cases/lto-r/main.c
patching file unit-tests/test-cases/lto-r/Makefile
patching file unit-tests/test-cases/lto-rename_section/a.c
patching file unit-tests/test-cases/lto-rename_section/b.c
patching file unit-tests/test-cases/lto-rename_section/main.c
patching file unit-tests/test-cases/lto-rename_section/Makefile
patching file unit-tests/test-cases/lto-rename_segment/a.c
patching file unit-tests/test-cases/lto-rename_segment/b.c
patching file unit-tests/test-cases/lto-rename_segment/main.c
patching file unit-tests/test-cases/lto-rename_segment/Makefile
patching file unit-tests/test-cases/lto-symbol-section-move/foo.c
patching file unit-tests/test-cases/lto-symbol-section-move/main.c
patching file unit-tests/test-cases/lto-symbol-section-move/Makefile
patching file unit-tests/test-cases/lto-symbol-section-move/other.c
patching file unit-tests/test-cases/lto-symbol-section-move/ram1.symbols
patching file unit-tests/test-cases/lto-symbol-section-move/rom1.symbols
patching file unit-tests/test-cases/preload-section_order/extra.s
patching file unit-tests/test-cases/preload-section_order/main1.expected
patching file unit-tests/test-cases/preload-section_order/main2.expected
patching file unit-tests/test-cases/preload-section_order/main.c
patching file unit-tests/test-cases/preload-section_order/Makefile
patching file unit-tests/test-cases/preload-section_order/more.s
patching file unit-tests/test-cases/preload-segment_order/a.c
patching file unit-tests/test-cases/preload-segment_order/b.c
patching file unit-tests/test-cases/preload-segment_order/main.c
patching file unit-tests/test-cases/preload-segment_order/main-segs.expected
patching file unit-tests/test-cases/preload-segment_order/Makefile
can't find file to patch at input line 4481
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/unit-tests/test-cases/section-labels/main.c ./unit-tests/test-cases/section-labels/main.c
|--- ../ld64-236.3/unit-tests/test-cases/section-labels/main.c 2014-04-05 00:42:29.000000000 +0200
|+++ ./unit-tests/test-cases/section-labels/main.c 2014-09-11 00:24:46.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file unit-tests/test-cases/symbol-section-move/main.c
patching file unit-tests/test-cases/symbol-section-move/Makefile
patching file unit-tests/test-cases/symbol-section-move/other.c
patching file unit-tests/test-cases/symbol-section-move/ram1.symbols
patching file unit-tests/test-cases/symbol-section-move/rom1.symbols
can't find file to patch at input line 4654
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ../ld64-236.3/unit-tests/test-cases/weak_import-undefined/Makefile ./unit-tests/test-cases/weak_import-undefined/Makefile
|--- ../ld64-236.3/unit-tests/test-cases/weak_import-undefined/Makefile 2014-04-05 00:42:29.000000000 +0200
|+++ ./unit-tests/test-cases/weak_import-undefined/Makefile 2014-09-11 00:24:46.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored