Skip to content

Instantly share code, notes, and snippets.

@tpoechtrager
Created October 25, 2015 12:22
Show Gist options
  • Save tpoechtrager/b8e86fd11833d93e8f96 to your computer and use it in GitHub Desktop.
Save tpoechtrager/b8e86fd11833d93e8f96 to your computer and use it in GitHub Desktop.
patching file src/ld/HeaderAndLoadCommands.hpp
patching file src/ld/LinkEdit.hpp
Hunk #4 merged at 1172.
Hunk #6 merged at 1230.
Hunk #7 merged at 1246,1248.
Hunk #8 merged at 1261.
Hunk #13 merged at 1386,1388.
patching file src/ld/LinkEditClassic.hpp
patching file src/ld/Options.cpp
Hunk #2 merged at 637,640, NOT MERGED at 643-649.
Hunk #11 merged at 4182,4189,4196.
Hunk #13 merged at 4245.
Hunk #27 merged at 4608.
Hunk #30 merged at 4741.
Hunk #33 NOT MERGED at 4974-4986, merged at 4992, merged at 4997, merged at 5004.
patching file src/ld/OutputFile.cpp
patching file src/ld/OutputFile.h
patching file src/ld/Resolver.cpp
Hunk #8 merged at 1079,1082,1091,1093.
patching file src/ld/ld.hpp
Hunk #9 NOT MERGED at 750-754, merged at 756.
can't find file to patch at input line 1781
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git src/ld/lto_file.hpp src/ld/lto_file.hpp
|index 01d8df3..24d3f58 100644
|--- src/ld/lto_file.hpp
|+++ src/ld/lto_file.hpp
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
patching file src/ld/parsers/archive_file.cpp
patching file src/ld/parsers/libunwind/DwarfInstructions.hpp
patching file src/ld/parsers/libunwind/Registers.hpp
patching file src/ld/parsers/macho_dylib_file.cpp
patching file src/ld/parsers/macho_relocatable_file.cpp
Hunk #15 merged at 2045,2047,2050,2053,2055,2058.
Hunk #23 merged at 4568,4570.
Hunk #24 merged at 4579,4581.
Hunk #25 merged at 4604,4606-4608.
Hunk #44 merged at 8487,8495,8504,8512,8519.
patching file src/ld/passes/branch_island.cpp
Hunk #2 merged at 100, NOT MERGED at 104-109.
Hunk #5 NOT MERGED at 366-370.
Hunk #7 NOT MERGED at 405-409.
Hunk #9 NOT MERGED at 442-446.
Hunk #12 merged at 618,621, NOT MERGED at 627-633.
Hunk #13 merged at 809,811,815,823.
patching file src/ld/passes/branch_shim.cpp
patching file src/ld/passes/compact_unwind.cpp
patching file src/ld/passes/dtrace_dof.cpp
patching file src/ld/passes/objc.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/stub_arm_classic.hpp
patching file src/ld/passes/stubs/stub_ppc_classic.hpp
patching file src/ld/passes/stubs/stubs.cpp
patching file src/other/ObjectDump.cpp
patching file src/other/dyldinfo.cpp
patching file src/other/machochecker.cpp
patching file src/other/rebase.cpp
patching file src/other/unwinddump.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment