Author: Jason Molenda Date: 2021-12-10T01:04:07-08:00 New Revision: efdac16b382b86358dba60f3a759c64a0fc446fc
URL: https://github.com/llvm/llvm-project/commit/efdac16b382b86358dba60f3a759c64a0fc446fc DIFF: https://github.com/llvm/llvm-project/commit/efdac16b382b86358dba60f3a759c64a0fc446fc.diff LOG: Remove one change from https://reviews.llvm.org/D115431 The change to ArchSpec::SetArchitecture that was setting the ObjectFile of a mach-o binary to llvm::Triple::MachO. It's not necessary for my patch, and it changes the output of image list -t causing TestUniversal.py to fail on x86_64 systems. The bots turned up the failure, I was developing and testing this on an Apple Silicon mac. Added: Modified: lldb/source/Utility/ArchSpec.cpp Removed: ################################################################################ diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp index ae3036c2c0772..74a4370423458 100644 --- a/lldb/source/Utility/ArchSpec.cpp +++ b/lldb/source/Utility/ArchSpec.cpp @@ -859,7 +859,6 @@ bool ArchSpec::SetArchitecture(ArchitectureType arch_type, uint32_t cpu, m_triple.setArchName(llvm::StringRef(core_def->name)); if (arch_type == eArchTypeMachO) { m_triple.setVendor(llvm::Triple::Apple); - m_triple.setObjectFormat(llvm::Triple::MachO); // Don't set the OS. It could be simulator, macosx, ios, watchos, // tvos, bridgeos. We could get close with the cpu type - but we _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
