diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 96f422710928bf1e75b48ae7a0652f6cc6bbe0cd..b939077e8b1efca4ce64d17385caf692490181b3 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -283,13 +283,17 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Distro == Distro::UbuntuKarmic || (IsAndroid && Triple.isAndroidVersionLT(23))) ExtraOpts.push_back("--hash-style=both"); + + // OHOS targets can handle hash-style=gnu + if (Triple.getVendor() == llvm::Triple::OHOS) + ExtraOpts.push_back("--hash-style=gnu"); } #ifdef ENABLE_LINKER_BUILD_ID ExtraOpts.push_back("--build-id"); #endif - if (IsAndroid || Distro.IsOpenSUSE()) + if (IsAndroid || Distro.IsOpenSUSE() || Triple.getVendor() == llvm::Triple::OHOS) ExtraOpts.push_back("--enable-new-dtags"); // The selection of paths to try here is designed to match the patterns which @@ -335,7 +339,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) // 64-bit OpenEmbedded sysroots may not have a /usr/lib dir. So they cannot // find /usr/lib64 as it is referenced as /usr/lib/../lib64. So we handle // this here. - if (Triple.getVendor() == llvm::Triple::OpenEmbedded && + if ((Triple.getVendor() == llvm::Triple::OpenEmbedded || Triple.getVendor() == llvm::Triple::OHOS) && Triple.isArch64Bit()) addPathIfExists(D, SysRoot + "/usr/" + OSLibDir, Paths); else diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h index 755222a7c56ca9f1166c2af23f7a78706a174ce7..ba7403df98cb2d13cb2bf787fceefabcdd6e2ada 100644 --- a/llvm/include/llvm/ADT/Triple.h +++ b/llvm/include/llvm/ADT/Triple.h @@ -158,7 +158,8 @@ public: Mesa, SUSE, OpenEmbedded, - LastVendorType = OpenEmbedded + OHOS, + LastVendorType = OHOS }; enum OSType { UnknownOS, diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 5df55959f7a7e7ebcb9da929bab351332806c551..194bb74c1fa49cdbda1b982ef09638e2cc52828c 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -172,6 +172,7 @@ StringRef Triple::getVendorTypeName(VendorType Kind) { case MipsTechnologies: return "mti"; case Myriad: return "myriad"; case NVIDIA: return "nvidia"; + case OHOS: return "ohos"; case OpenEmbedded: return "oe"; case PC: return "pc"; case SCEI: return "scei"; @@ -491,6 +492,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) { .Case("mesa", Triple::Mesa) .Case("suse", Triple::SUSE) .Case("oe", Triple::OpenEmbedded) + .Case("ohos", Triple::OHOS) .Default(Triple::UnknownVendor); }