[Lldb-commits] [lldb] r282013 - [PECOFF] Use the COFF subsystem field when determining the Triple.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Tue Sep 20 15:44:50 2016
New Revision: 282013

URL: http://llvm.org/viewvc/llvm-project?rev=282013&view=rev
Log:
[PECOFF] Use the COFF subsystem field when determining the Triple.

Patch by walter erquinigo
Differential revision: https://reviews.llvm.org/D24284

Modified:
    lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
    lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h

Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp?rev=282013&r1=282012&r2=282013&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp Tue Sep 20 15:44:50 2016
@@ -944,6 +944,21 @@ void ObjectFilePECOFF::DumpSectionHeader
   }
 }
 
+bool ObjectFilePECOFF::IsWindowsSubsystem() {
+  switch (m_coff_header_opt.subsystem) {
+  case llvm::COFF::IMAGE_SUBSYSTEM_NATIVE:
+  case llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI:
+  case llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI:
+  case llvm::COFF::IMAGE_SUBSYSTEM_NATIVE_WINDOWS:
+  case llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CE_GUI:
+  case llvm::COFF::IMAGE_SUBSYSTEM_XBOX:
+  case llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION:
+    return true;
+  default:
+    return false;
+  }
+}
+
 bool ObjectFilePECOFF::GetArchitecture(ArchSpec &arch) {
   uint16_t machine = m_coff_header.machine;
   switch (machine) {
@@ -954,7 +969,9 @@ bool ObjectFilePECOFF::GetArchitecture(A
   case llvm::COFF::IMAGE_FILE_MACHINE_ARM:
   case llvm::COFF::IMAGE_FILE_MACHINE_ARMNT:
   case llvm::COFF::IMAGE_FILE_MACHINE_THUMB:
-    arch.SetArchitecture(eArchTypeCOFF, machine, LLDB_INVALID_CPUTYPE);
+    arch.SetArchitecture(eArchTypeCOFF, machine, LLDB_INVALID_CPUTYPE,
+                         IsWindowsSubsystem() ? llvm::Triple::Win32
+                                              : llvm::Triple::UnknownOS);
     return true;
   default:
     break;

Modified: lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h?rev=282013&r1=282012&r2=282013&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h (original)
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h Tue Sep 20 15:44:50 2016
@@ -128,6 +128,8 @@ public:
 
   uint32_t GetPluginVersion() override;
 
+  bool IsWindowsSubsystem();
+
 protected:
   bool NeedsEndianSwap() const;