[llvm] d987eed - [llvm-objcopy][MachO] Copy LC_LOAD_WEAK_DYLIB load commands

[Alexander Shaposhnikov via llvm-commits]

Author: Alexander Shaposhnikov
Date: 2020-04-23T12:21:44-07:00
New Revision: d987eed91d4866a041a3a0c6b3aacb15cfebb3ee

URL: https://github.com/llvm/llvm-project/commit/d987eed91d4866a041a3a0c6b3aacb15cfebb3ee
DIFF: https://github.com/llvm/llvm-project/commit/d987eed91d4866a041a3a0c6b3aacb15cfebb3ee.diff

LOG: [llvm-objcopy][MachO] Copy LC_LOAD_WEAK_DYLIB load commands

LC_LOAD_WEAK_DYLIB is analogous to LC_LOAD_DYLIB and doesn't require any special handling.

Test plan: make check-all

Differential revision: https://reviews.llvm.org/D78602

Added: 
    llvm/test/tools/llvm-objcopy/MachO/lc-load-weak-dylib.test

Modified: 
    llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objcopy/MachO/lc-load-weak-dylib.test b/llvm/test/tools/llvm-objcopy/MachO/lc-load-weak-dylib.test
new file mode 100644
index 000000000000..aaf0a220d25b
--- /dev/null
+++ b/llvm/test/tools/llvm-objcopy/MachO/lc-load-weak-dylib.test
@@ -0,0 +1,25 @@
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-objcopy %t %t.copy
+# RUN: cmp %t %t.copy
+
+--- !mach-o
+FileHeader:
+  magic:           0xFEEDFACF
+  cputype:         0x0100000C
+  cpusubtype:      0x00000000
+  filetype:        0x00000002
+  ncmds:           1
+  sizeofcmds:      80
+  flags:           0x00002000
+  reserved:        0x00000000
+LoadCommands:
+ - cmd:             LC_LOAD_WEAK_DYLIB
+   cmdsize:         80
+   dylib:
+     name:            24
+     timestamp:       2
+     current_version: 65536
+     compatibility_version: 65536
+   PayloadString:   '/System/Library/Frameworks/Network.framework/Network'
+   ZeroPadBytes:    4
+...

diff  --git a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
index 102482e5005c..e6c5dde42027 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
@@ -340,6 +340,7 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
     case MachO::LC_BUILD_VERSION:
     case MachO::LC_ID_DYLIB:
     case MachO::LC_LOAD_DYLIB:
+    case MachO::LC_LOAD_WEAK_DYLIB:
     case MachO::LC_UUID:
     case MachO::LC_SOURCE_VERSION:
       // Nothing to update.