maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add support for more OS types to AddClangModuleCompilationOptionsForSDKType() 

This patch also avoids hardcoding the clang options, which makes it
less likely for them to become out-of-date.

rdar://problem/63791367+66927829

Differential Revision: https://reviews.llvm.org/D89428
This commit is contained in:
Adrian Prantl 2020-10-16 11:42:08 -07:00
parent 0b1b2a180c
commit cf24508651
1 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -1521,25 +1521,20 @@ void PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
StreamString minimum_version_option; StreamString minimum_version_option;
bool use_current_os_version = false; bool use_current_os_version = false;
// If the SDK type is for the host OS, use its version number.
auto get_host_os = []() { return HostInfo::GetTargetTriple().getOS(); };
switch (sdk_type) { switch (sdk_type) {
case XcodeSDK::Type::iPhoneOS:
#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
use_current_os_version = true;
#else
use_current_os_version = false;
#endif
break;
case XcodeSDK::Type::iPhoneSimulator:
use_current_os_version = false;
break;
case XcodeSDK::Type::MacOSX: case XcodeSDK::Type::MacOSX:
#if defined(__i386__) || defined(__x86_64__) use_current_os_version = get_host_os() == llvm::Triple::MacOSX;
use_current_os_version = true; break;
#else case XcodeSDK::Type::iPhoneOS:
use_current_os_version = false; use_current_os_version = get_host_os() == llvm::Triple::IOS;
#endif break;
case XcodeSDK::Type::AppleTVOS:
use_current_os_version = get_host_os() == llvm::Triple::TvOS;
break;
case XcodeSDK::Type::watchOS:
use_current_os_version = get_host_os() == llvm::Triple::WatchOS;
break; break;
default: default:
break; break;
@ -1559,32 +1554,49 @@ void PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
} }
} }
// Only add the version-min options if we got a version from somewhere // Only add the version-min options if we got a version from somewhere
if (!version.empty()) { if (!version.empty() && sdk_type != XcodeSDK::Type::Linux) {
#define OPTION(PREFIX, NAME, VAR, ...) \
const char *opt_##VAR = NAME; \
(void)opt_##VAR;
#include "clang/Driver/Options.inc"
#undef OPTION
minimum_version_option << '-';
switch (sdk_type) { switch (sdk_type) {
case XcodeSDK::Type::iPhoneOS: case XcodeSDK::Type::MacOSX:
minimum_version_option.PutCString("-mios-version-min="); minimum_version_option << opt_mmacosx_version_min_EQ;
minimum_version_option.PutCString(version.getAsString());
break; break;
case XcodeSDK::Type::iPhoneSimulator: case XcodeSDK::Type::iPhoneSimulator:
minimum_version_option.PutCString("-mios-simulator-version-min="); minimum_version_option << opt_mios_simulator_version_min_EQ;
minimum_version_option.PutCString(version.getAsString());
break; break;
case XcodeSDK::Type::MacOSX: case XcodeSDK::Type::iPhoneOS:
minimum_version_option.PutCString("-mmacosx-version-min="); minimum_version_option << opt_mios_version_min_EQ;
minimum_version_option.PutCString(version.getAsString());
break;
case XcodeSDK::Type::WatchSimulator:
minimum_version_option.PutCString("-mwatchos-simulator-version-min=");
minimum_version_option.PutCString(version.getAsString());
break; break;
case XcodeSDK::Type::AppleTVSimulator: case XcodeSDK::Type::AppleTVSimulator:
minimum_version_option.PutCString("-mtvos-version-min="); minimum_version_option << opt_mtvos_simulator_version_min_EQ;
minimum_version_option.PutCString(version.getAsString());
break; break;
default: case XcodeSDK::Type::AppleTVOS:
llvm_unreachable("unsupported sdk"); minimum_version_option << opt_mtvos_version_min_EQ;
break;
case XcodeSDK::Type::WatchSimulator:
minimum_version_option << opt_mwatchos_simulator_version_min_EQ;
break;
case XcodeSDK::Type::watchOS:
minimum_version_option << opt_mwatchos_version_min_EQ;
break;
case XcodeSDK::Type::bridgeOS:
case XcodeSDK::Type::Linux:
case XcodeSDK::Type::unknown:
if (lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST)) {
XcodeSDK::Info info;
info.type = sdk_type;
LLDB_LOGF(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST),
"Clang modules on %s are not supported",
XcodeSDK::GetCanonicalName(info).c_str());
}
return;
} }
options.push_back(std::string(minimum_version_option.GetString())); minimum_version_option << version.getAsString();
options.emplace_back(std::string(minimum_version_option.GetString()));
} }
FileSpec sysroot_spec; FileSpec sysroot_spec;