From b684580f2e7e560928da459153e3a135efe3a6ca Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Wed, 13 Sep 2017 01:18:06 +0000 Subject: [PATCH] [Fuchsia] Magenta -> Zircon Fuchsia's lowest API layer has been renamed from Magenta to Zircon. In LLVM proper, this is only mentioned in comments. Patch by Roland McGrath Differential Revision: https://reviews.llvm.org/D37763 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313105 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64ISelLowering.cpp | 4 ++-- lib/Target/X86/X86ISelLowering.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Target/AArch64/AArch64ISelLowering.cpp b/lib/Target/AArch64/AArch64ISelLowering.cpp index 3daa3105862..693c3cb5ed6 100644 --- a/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -10835,7 +10835,7 @@ Value *AArch64TargetLowering::getIRStackGuard(IRBuilder<> &IRB) const { return UseTlsOffset(IRB, 0x28); // Fuchsia is similar. - // defines MX_TLS_STACK_GUARD_OFFSET with this value. + // defines ZX_TLS_STACK_GUARD_OFFSET with this value. if (Subtarget->isTargetFuchsia()) return UseTlsOffset(IRB, -0x10); @@ -10850,7 +10850,7 @@ Value *AArch64TargetLowering::getSafeStackPointerLocation(IRBuilder<> &IRB) cons return UseTlsOffset(IRB, 0x48); // Fuchsia is similar. - // defines MX_TLS_UNSAFE_SP_OFFSET with this value. + // defines ZX_TLS_UNSAFE_SP_OFFSET with this value. if (Subtarget->isTargetFuchsia()) return UseTlsOffset(IRB, -0x8); diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 942669c958c..906dfe02765 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -2020,7 +2020,7 @@ Value *X86TargetLowering::getIRStackGuard(IRBuilder<> &IRB) const { // sysdeps/{i386,x86_64}/nptl/tls.h) if (hasStackGuardSlotTLS(Subtarget.getTargetTriple())) { if (Subtarget.isTargetFuchsia()) { - // defines MX_TLS_STACK_GUARD_OFFSET with this value. + // defines ZX_TLS_STACK_GUARD_OFFSET with this value. return SegmentOffset(IRB, 0x10, getAddressSpace()); } else { // %fs:0x28, unless we're using a Kernel code model, in which case @@ -2085,7 +2085,7 @@ Value *X86TargetLowering::getSafeStackPointerLocation(IRBuilder<> &IRB) const { // Fuchsia is similar. if (Subtarget.isTargetFuchsia()) { - // defines MX_TLS_UNSAFE_SP_OFFSET with this value. + // defines ZX_TLS_UNSAFE_SP_OFFSET with this value. return SegmentOffset(IRB, 0x18, getAddressSpace()); } -- 2.11.0