Revert "Replace ArchSpec::PiecewiseCompare() with Triple::operator==()"

This reverts commit 5e6bed8c0ea2f7fe380127763c8f753adae0fc1b while investigating the bots.

Author: adrian-prantl

lldb/include/lldb/Utility/ArchSpec.h

@@ -505,6 +505,11 @@ class ArchSpec {
 
   bool IsFullySpecifiedTriple() const;
 
+  void PiecewiseTripleCompare(const ArchSpec &other, bool &arch_different,
+                              bool &vendor_different, bool &os_different,
+                              bool &os_version_different,
+                              bool &env_different) const;
+
   /// Detect whether this architecture uses thumb code exclusively
   ///
   /// Some embedded ARM chips (e.g. the ARM Cortex M0-7 line) can only execute

lldb/source/Target/Target.cpp

@@ -1568,8 +1568,14 @@ bool Target::SetArchitecture(const ArchSpec &arch_spec, bool set_platform,
 
       if (m_arch.GetSpec().IsCompatibleMatch(other)) {
         compatible_local_arch = true;
+        bool arch_changed, vendor_changed, os_changed, os_ver_changed,
+            env_changed;
 
-        if (m_arch.GetSpec().GetTriple() == other.GetTriple())
+        m_arch.GetSpec().PiecewiseTripleCompare(other, arch_changed,
+                                                vendor_changed, os_changed,
+                                                os_ver_changed, env_changed);
+
+        if (!arch_changed && !vendor_changed && !os_changed && !env_changed)
           replace_local_arch = false;
       }
     }

lldb/source/Utility/ArchSpec.cpp

@@ -1421,6 +1421,23 @@ bool ArchSpec::IsFullySpecifiedTriple() const {
   return true;
 }
 
+void ArchSpec::PiecewiseTripleCompare(
+    const ArchSpec &other, bool &arch_different, bool &vendor_different,
+    bool &os_different, bool &os_version_different, bool &env_different) const {
+  const llvm::Triple &me(GetTriple());
+  const llvm::Triple &them(other.GetTriple());
+
+  arch_different = (me.getArch() != them.getArch());
+
+  vendor_different = (me.getVendor() != them.getVendor());
+
+  os_different = (me.getOS() != them.getOS());
+
+  os_version_different = (me.getOSMajorVersion() != them.getOSMajorVersion());
+
+  env_different = (me.getEnvironment() != them.getEnvironment());
+}
+
 bool ArchSpec::IsAlwaysThumbInstructions() const {
   std::string Status;
   if (GetTriple().getArch() == llvm::Triple::arm ||