Author: Jonas Devlieghere Date: 2024-02-19T12:20:23-08:00 New Revision: 1b26c25f7e56fe3d5e06c285566ef43812d7baee
URL: https://github.com/llvm/llvm-project/commit/1b26c25f7e56fe3d5e06c285566ef43812d7baee DIFF: https://github.com/llvm/llvm-project/commit/1b26c25f7e56fe3d5e06c285566ef43812d7baee.diff LOG: [llvm] Upstream the BridgeOS triple enum value (NFC) This upstreams the BridgeOS target triple enum value. Added: Modified: lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.cpp lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp llvm/include/llvm/TargetParser/Triple.h llvm/lib/TargetParser/Triple.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 4128ac1cdf1bba..3bdbce5a3b7c46 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -167,7 +167,7 @@ DynamicLoader *DynamicLoaderDarwinKernel::CreateInstance(Process *process, case llvm::Triple::TvOS: case llvm::Triple::WatchOS: case llvm::Triple::XROS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: if (triple_ref.getVendor() != llvm::Triple::Apple) { return nullptr; } diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp index 33bb7f076848e1..0e17d57fa9c4fb 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp @@ -404,8 +404,8 @@ bool DynamicLoaderDarwin::JSONImageInformationIntoImageInfo( image_infos[i].os_type = llvm::Triple::TvOS; else if (os_name == "watchos") image_infos[i].os_type = llvm::Triple::WatchOS; - // NEED_BRIDGEOS_TRIPLE else if (os_name == "bridgeos") - // NEED_BRIDGEOS_TRIPLE image_infos[i].os_type = llvm::Triple::BridgeOS; + else if (os_name == "bridgeos") + image_infos[i].os_type = llvm::Triple::BridgeOS; else if (os_name == "maccatalyst") { image_infos[i].os_type = llvm::Triple::IOS; image_infos[i].os_env = llvm::Triple::MacABI; diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp index 261592558095b4..7878c506231120 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp @@ -56,7 +56,7 @@ DynamicLoader *DynamicLoaderMacOS::CreateInstance(Process *process, case llvm::Triple::TvOS: case llvm::Triple::WatchOS: case llvm::Triple::XROS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: create = triple_ref.getVendor() == llvm::Triple::Apple; break; default: diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 7e589b0d7af2c7..9ceadb21d28413 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -76,7 +76,7 @@ DynamicLoader *DynamicLoaderMacOSXDYLD::CreateInstance(Process *process, case llvm::Triple::TvOS: case llvm::Triple::WatchOS: case llvm::Triple::XROS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: create = triple_ref.getVendor() == llvm::Triple::Apple; break; default: diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index b652ede9b1f518..147c00e51b40dc 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -831,7 +831,7 @@ uint32_t EmulateInstructionARM::GetFramePointerRegisterNumber() const { case llvm::Triple::TvOS: case llvm::Triple::WatchOS: case llvm::Triple::XROS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: is_apple = true; break; default: diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 8cb9a5989d8984..729fbd3256715d 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -4889,14 +4889,12 @@ struct OSEnv { case llvm::MachO::PLATFORM_WATCHOS: os_type = llvm::Triple::getOSTypeName(llvm::Triple::WatchOS); return; - // TODO: add BridgeOS & DriverKit once in llvm/lib/Support/Triple.cpp - // NEED_BRIDGEOS_TRIPLE - // case llvm::MachO::PLATFORM_BRIDGEOS: - // os_type = llvm::Triple::getOSTypeName(llvm::Triple::BridgeOS); - // return; - // case llvm::MachO::PLATFORM_DRIVERKIT: - // os_type = llvm::Triple::getOSTypeName(llvm::Triple::DriverKit); - // return; + case llvm::MachO::PLATFORM_BRIDGEOS: + os_type = llvm::Triple::getOSTypeName(llvm::Triple::BridgeOS); + return; + case llvm::MachO::PLATFORM_DRIVERKIT: + os_type = llvm::Triple::getOSTypeName(llvm::Triple::DriverKit); + return; case llvm::MachO::PLATFORM_MACCATALYST: os_type = llvm::Triple::getOSTypeName(llvm::Triple::IOS); environment = llvm::Triple::getEnvironmentTypeName(llvm::Triple::MacABI); diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp index 1f121f5c4e5d0a..6f75e5ea70b6a0 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -127,7 +127,7 @@ PlatformSP PlatformDarwinKernel::CreateInstance(bool force, case llvm::Triple::IOS: case llvm::Triple::WatchOS: case llvm::Triple::TvOS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: break; // Only accept "vendor" for vendor if the host is Apple and it "unknown" // wasn't specified (it was just returned because it was NOT specified) diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.cpp index 5515d76a1c99d2..2aa4ad56bb84ad 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.cpp @@ -103,9 +103,8 @@ PlatformSP PlatformRemoteAppleBridge::CreateInstance(bool force, #pragma warning(disable : 4065) #endif switch (triple.getOS()) { - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: - // break; - + case llvm::Triple::BridgeOS: + break; default: create = false; break; diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp index a97e51cc7b7d0a..34ce175920d1ed 100644 --- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp +++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp @@ -62,7 +62,7 @@ SystemRuntime *SystemRuntimeMacOSX::CreateInstance(Process *process) { case llvm::Triple::TvOS: case llvm::Triple::WatchOS: case llvm::Triple::XROS: - // NEED_BRIDGEOS_TRIPLE case llvm::Triple::BridgeOS: + case llvm::Triple::BridgeOS: create = triple_ref.getVendor() == llvm::Triple::Apple; break; default: diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h index 57846ea009509c..f256e2b205a889 100644 --- a/llvm/include/llvm/TargetParser/Triple.h +++ b/llvm/include/llvm/TargetParser/Triple.h @@ -214,6 +214,7 @@ class Triple { ELFIAMCU, TvOS, // Apple tvOS WatchOS, // Apple watchOS + BridgeOS, // Apple bridgeOS DriverKit, // Apple DriverKit XROS, // Apple XROS Mesa3D, diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp index 3cd897aeb5970a..ccdaf768710e19 100644 --- a/llvm/lib/TargetParser/Triple.cpp +++ b/llvm/lib/TargetParser/Triple.cpp @@ -240,6 +240,7 @@ StringRef Triple::getOSTypeName(OSType Kind) { case AIX: return "aix"; case AMDHSA: return "amdhsa"; case AMDPAL: return "amdpal"; + case BridgeOS: return "bridgeos"; case CUDA: return "cuda"; case Darwin: return "darwin"; case DragonFly: return "dragonfly"; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
