Skip to content

Commit a63dc79

Browse files
authored
[Clang][OHOS] Keep ARM ABI selection logic in sync between Clang and LLVM (#68656)
1 parent 1f12223 commit a63dc79

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

clang/lib/Basic/Targets/ARM.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ ARMTargetInfo::ARMTargetInfo(const llvm::Triple &Triple,
258258
bool IsOpenBSD = Triple.isOSOpenBSD();
259259
bool IsNetBSD = Triple.isOSNetBSD();
260260
bool IsHaiku = Triple.isOSHaiku();
261+
bool IsOHOS = Triple.isOHOSFamily();
261262

262263
// FIXME: the isOSBinFormatMachO is a workaround for identifying a Darwin-like
263264
// environment where size_t is `unsigned long` rather than `unsigned int`
@@ -324,7 +325,7 @@ ARMTargetInfo::ARMTargetInfo(const llvm::Triple &Triple,
324325
default:
325326
if (IsNetBSD)
326327
setABI("apcs-gnu");
327-
else if (IsFreeBSD || IsOpenBSD || IsHaiku)
328+
else if (IsFreeBSD || IsOpenBSD || IsHaiku || IsOHOS)
328329
setABI("aapcs-linux");
329330
else
330331
setABI("aapcs");

llvm/lib/TargetParser/ARMTargetParser.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ StringRef ARM::computeDefaultTargetABI(const Triple &TT, StringRef CPU) {
559559
case Triple::GNUEABIHF:
560560
case Triple::MuslEABI:
561561
case Triple::MuslEABIHF:
562+
case Triple::OpenHOS:
562563
return "aapcs-linux";
563564
case Triple::EABIHF:
564565
case Triple::EABI:

0 commit comments

Comments
 (0)