darlinghq/cctools-port
1
0
Fork 0
mirror of https://github.com/darlinghq/cctools-port.git synced 2024-11-23 12:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2f128d5d36
cctools-port/.merge.log
Thomas Pöchtrager 16e8e127e3 cctools 877.8
2016-05-09 21:29:06 +02:00

632 lines
26 KiB
Plaintext
Raw Blame History

## 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
Reference in New Issue View Git Blame Copy Permalink