From 412437aec088974a7d6534ff388a531f65f2b03f Mon Sep 17 00:00:00 2001
From: Alexander Shaposhnikov <alexshap@fb.com>
Date: Tue, 27 Apr 2021 16:18:12 -0700
Subject: [PATCH] Revert "[llvm-objcopy][MachO] Add support for
 LC_THREAD/LC_UNIXTHREAD"

This reverts commit 4dfddf715b94857998601aa79c25e4f327d44dfa
since it breaks some build bots (e.g. clang-ppc64be-linux)
---
 .../tools/llvm-objcopy/MachO/lc-thread.test   | 43 -------------------
 .../llvm-objcopy/MachO/MachOLayoutBuilder.cpp |  2 -
 2 files changed, 45 deletions(-)
 delete mode 100644 llvm/test/tools/llvm-objcopy/MachO/lc-thread.test

diff --git a/llvm/test/tools/llvm-objcopy/MachO/lc-thread.test b/llvm/test/tools/llvm-objcopy/MachO/lc-thread.test
deleted file mode 100644
index 3c9b71ad46fe..000000000000
--- a/llvm/test/tools/llvm-objcopy/MachO/lc-thread.test
+++ /dev/null
@@ -1,43 +0,0 @@
-## This test verifies that the load commands LC_THREAD/LC_UNIXTHREAD
-## are copied correctly.
-
-# RUN: yaml2obj -D LC_NAME=LC_THREAD %s -o  %t.lc_thread.exe
-# RUN: llvm-objcopy %t.lc_thread.exe %t.lc_thread.exe.copy
-# RUN: cmp %t.lc_thread.exe %t.lc_thread.exe.copy
-
-# RUN: yaml2obj -D LC_NAME=LC_UNIXTHREAD %s -o %t.lc_unixthread.exe
-# RUN: llvm-objcopy %t.lc_unixthread.exe %t.lc_unixthread.exe.copy
-# RUN: cmp %t.lc_unixthread.exe %t.lc_unixthread.exe.copy
-
---- !mach-o
-FileHeader:
-  magic:           0xFEEDFACF
-  cputype:         0x1000007
-  cpusubtype:      0x3
-  filetype:        0x2
-  ncmds:           1
-  sizeofcmds:      184
-  flags:           0x18085
-  reserved:        0x0
-LoadCommands:
-  - cmd:             [[LC_NAME]]
-    cmdsize:         184
-    PayloadBytes:    [ 0x4, 0x0, 0x0, 0x0, 0x2A, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5C, 0xB, 0x0, 0x0,
-                       0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-                       0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
-...
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
index c6cbfee44e67..8e2bf36238ec 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
@@ -371,8 +371,6 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
     case MachO::LC_LOAD_WEAK_DYLIB:
     case MachO::LC_UUID:
     case MachO::LC_SOURCE_VERSION:
-    case MachO::LC_THREAD:
-    case MachO::LC_UNIXTHREAD:
       // Nothing to update.
       break;
     default: