[Lldb-commits] [lldb] 3c79212 - [Host] Check for TARGET_OS_EMBEDDED instead of listing architectures.

Davide Italiano via lldb-commits lldb-commits at lists.llvm.org
Tue Jun 23 12:27:30 PDT 2020


Author: Davide Italiano
Date: 2020-06-23T12:27:21-07:00
New Revision: 3c79212319d878b07ef259d735b52b379f774e25

URL: https://github.com/llvm/llvm-project/commit/3c79212319d878b07ef259d735b52b379f774e25
DIFF: https://github.com/llvm/llvm-project/commit/3c79212319d878b07ef259d735b52b379f774e25.diff

LOG: [Host] Check for TARGET_OS_EMBEDDED instead of listing architectures.

With the advent of Apple Silicon, checking for the architectures
specifically is not correct anymore. This code is only supposed to
run on embedded devices (iPhones et similia), so mark it accordingly.

Added: 
    

Modified: 
    lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm

Removed: 
    


################################################################################
diff  --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
index fd88d0c31de6..8d8db2f246a7 100644
--- a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
+++ b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -136,7 +136,7 @@ static void ParseOSVersion(llvm::VersionTuple &version, NSString *Key) {
   size_t framework_pos = raw_path.find("LLDB.framework");
   if (framework_pos != std::string::npos) {
     framework_pos += strlen("LLDB.framework");
-#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
+#if TARGET_OS_EMBEDDED
     // Shallow bundle
     raw_path.resize(framework_pos);
 #else


        


More information about the lldb-commits mailing list