From c0da287c30c9f511ccb07fdd42c997be2caea9ec Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Mon, 26 Jul 2021 09:04:51 -0700 Subject: [yaml2obj][MachO] Rename PayloadString to Content The new name is conciser and matches yaml2obj ELF & DWARF. Reviewed By: #lld-macho, thakis Differential Revision: https://reviews.llvm.org/D106759 --- llvm/test/ObjectYAML/MachO/dylib_dylinker_command.yaml | 12 ++++++------ llvm/test/ObjectYAML/MachO/export_trie.yaml | 6 +++--- llvm/test/ObjectYAML/MachO/null_string_entries.yaml | 6 +++--- llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml | 6 +++--- llvm/test/ObjectYAML/MachO/symtab.yaml | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'llvm/test/ObjectYAML/MachO') diff --git a/llvm/test/ObjectYAML/MachO/dylib_dylinker_command.yaml b/llvm/test/ObjectYAML/MachO/dylib_dylinker_command.yaml index 5fc6afa53..d40546e 100644 --- a/llvm/test/ObjectYAML/MachO/dylib_dylinker_command.yaml +++ b/llvm/test/ObjectYAML/MachO/dylib_dylinker_command.yaml @@ -14,7 +14,7 @@ LoadCommands: - cmd: LC_LOAD_DYLINKER cmdsize: 32 name: 12 - PayloadString: /usr/lib/dyld + Content: /usr/lib/dyld ZeroPadBytes: 7 - cmd: LC_LOAD_DYLIB cmdsize: 48 @@ -23,7 +23,7 @@ LoadCommands: timestamp: 2 current_version: 7864576 compatibility_version: 65536 - PayloadString: '/usr/lib/libc++.1.dylib' + Content: '/usr/lib/libc++.1.dylib' ZeroPadBytes: 1 - cmd: LC_LOAD_DYLIB cmdsize: 56 @@ -32,7 +32,7 @@ LoadCommands: timestamp: 2 current_version: 80349697 compatibility_version: 65536 - PayloadString: /usr/lib/libSystem.B.dylib + Content: /usr/lib/libSystem.B.dylib ZeroPadBytes: 6 ... @@ -40,7 +40,7 @@ LoadCommands: #CHECK: - cmd: LC_LOAD_DYLINKER #CHECK: cmdsize: 32 #CHECK: name: 12 -#CHECK: PayloadString: '/usr/lib/dyld' +#CHECK: Content: '/usr/lib/dyld' #CHECK: ZeroPadBytes: 7 #CHECK: - cmd: LC_LOAD_DYLIB #CHECK: cmdsize: 48 @@ -49,7 +49,7 @@ LoadCommands: #CHECK: timestamp: 2 #CHECK: current_version: 7864576 #CHECK: compatibility_version: 65536 -#CHECK: PayloadString: '/usr/lib/libc++.1.dylib' +#CHECK: Content: '/usr/lib/libc++.1.dylib' #CHECK: ZeroPadBytes: 1 #CHECK: - cmd: LC_LOAD_DYLIB #CHECK: cmdsize: 56 @@ -58,5 +58,5 @@ LoadCommands: #CHECK: timestamp: 2 #CHECK: current_version: 80349697 #CHECK: compatibility_version: 65536 -#CHECK: PayloadString: '/usr/lib/libSystem.B.dylib' +#CHECK: Content: '/usr/lib/libSystem.B.dylib' #CHECK: ZeroPadBytes: 6 diff --git a/llvm/test/ObjectYAML/MachO/export_trie.yaml b/llvm/test/ObjectYAML/MachO/export_trie.yaml index 6453752..635e507 100644 --- a/llvm/test/ObjectYAML/MachO/export_trie.yaml +++ b/llvm/test/ObjectYAML/MachO/export_trie.yaml @@ -96,7 +96,7 @@ LoadCommands: - cmd: LC_LOAD_DYLINKER cmdsize: 32 name: 12 - PayloadString: /usr/lib/dyld + Content: /usr/lib/dyld ZeroPadBytes: 7 - cmd: LC_UUID cmdsize: 24 @@ -119,7 +119,7 @@ LoadCommands: timestamp: 2 current_version: 7864576 compatibility_version: 65536 - PayloadString: '/usr/lib/libc++.1.dylib' + Content: '/usr/lib/libc++.1.dylib' ZeroPadBytes: 1 - cmd: LC_LOAD_DYLIB cmdsize: 56 @@ -128,7 +128,7 @@ LoadCommands: timestamp: 2 current_version: 80349697 compatibility_version: 65536 - PayloadString: /usr/lib/libSystem.B.dylib + Content: /usr/lib/libSystem.B.dylib ZeroPadBytes: 6 - cmd: LC_FUNCTION_STARTS cmdsize: 16 diff --git a/llvm/test/ObjectYAML/MachO/null_string_entries.yaml b/llvm/test/ObjectYAML/MachO/null_string_entries.yaml index d08275a..4bae31c 100644 --- a/llvm/test/ObjectYAML/MachO/null_string_entries.yaml +++ b/llvm/test/ObjectYAML/MachO/null_string_entries.yaml @@ -95,7 +95,7 @@ LoadCommands: - cmd: LC_LOAD_DYLINKER cmdsize: 28 name: 12 - PayloadString: /usr/lib/dyld + Content: /usr/lib/dyld ZeroPadBytes: 3 - cmd: LC_UUID cmdsize: 24 @@ -118,7 +118,7 @@ LoadCommands: timestamp: 2 current_version: 7864576 compatibility_version: 65536 - PayloadString: '/usr/lib/libc++.1.dylib' + Content: '/usr/lib/libc++.1.dylib' ZeroPadBytes: 1 - cmd: LC_LOAD_DYLIB cmdsize: 52 @@ -127,7 +127,7 @@ LoadCommands: timestamp: 2 current_version: 80349697 compatibility_version: 65536 - PayloadString: /usr/lib/libSystem.B.dylib + Content: /usr/lib/libSystem.B.dylib ZeroPadBytes: 2 - cmd: LC_FUNCTION_STARTS cmdsize: 16 diff --git a/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml b/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml index d318e33..3b6ec55 100644 --- a/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml +++ b/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml @@ -96,7 +96,7 @@ LoadCommands: - cmd: LC_LOAD_DYLINKER cmdsize: 32 name: 12 - PayloadString: /usr/lib/dyld + Content: /usr/lib/dyld ZeroPadBytes: 7 - cmd: LC_UUID cmdsize: 24 @@ -119,7 +119,7 @@ LoadCommands: timestamp: 2 current_version: 7864576 compatibility_version: 65536 - PayloadString: '/usr/lib/libc++.1.dylib' + Content: '/usr/lib/libc++.1.dylib' ZeroPadBytes: 1 - cmd: LC_LOAD_DYLIB cmdsize: 56 @@ -128,7 +128,7 @@ LoadCommands: timestamp: 2 current_version: 80349697 compatibility_version: 65536 - PayloadString: /usr/lib/libSystem.B.dylib + Content: /usr/lib/libSystem.B.dylib ZeroPadBytes: 6 - cmd: LC_FUNCTION_STARTS cmdsize: 16 diff --git a/llvm/test/ObjectYAML/MachO/symtab.yaml b/llvm/test/ObjectYAML/MachO/symtab.yaml index 5ba75a1..8cff549 100644 --- a/llvm/test/ObjectYAML/MachO/symtab.yaml +++ b/llvm/test/ObjectYAML/MachO/symtab.yaml @@ -98,7 +98,7 @@ LoadCommands: - cmd: LC_LOAD_DYLINKER cmdsize: 32 name: 12 - PayloadString: /usr/lib/dyld + Content: /usr/lib/dyld ZeroPadBytes: 7 - cmd: LC_UUID cmdsize: 24 @@ -121,7 +121,7 @@ LoadCommands: timestamp: 2 current_version: 7864576 compatibility_version: 65536 - PayloadString: '/usr/lib/libc++.1.dylib' + Content: '/usr/lib/libc++.1.dylib' ZeroPadBytes: 1 - cmd: LC_LOAD_DYLIB cmdsize: 56 @@ -130,7 +130,7 @@ LoadCommands: timestamp: 2 current_version: 80349697 compatibility_version: 65536 - PayloadString: /usr/lib/libSystem.B.dylib + Content: /usr/lib/libSystem.B.dylib ZeroPadBytes: 6 - cmd: LC_FUNCTION_STARTS cmdsize: 16 -- cgit v1.1