Permalink
Browse files

[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
  • Loading branch information...
petrhosek committed Sep 13, 2017
1 parent c1e866c commit b684580f2e7e560928da459153e3a135efe3a6ca
Showing with 4 additions and 4 deletions.
  1. +2 −2 lib/Target/AArch64/AArch64ISelLowering.cpp
  2. +2 −2 lib/Target/X86/X86ISelLowering.cpp
@@ -10835,7 +10835,7 @@ Value *AArch64TargetLowering::getIRStackGuard(IRBuilder<> &IRB) const {
return UseTlsOffset(IRB, 0x28);
// Fuchsia is similar.
// <magenta/tls.h> defines MX_TLS_STACK_GUARD_OFFSET with this value.
// <zircon/tls.h> 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.
// <magenta/tls.h> defines MX_TLS_UNSAFE_SP_OFFSET with this value.
// <zircon/tls.h> defines ZX_TLS_UNSAFE_SP_OFFSET with this value.
if (Subtarget->isTargetFuchsia())
return UseTlsOffset(IRB, -0x8);
@@ -2020,7 +2020,7 @@ Value *X86TargetLowering::getIRStackGuard(IRBuilder<> &IRB) const {
// sysdeps/{i386,x86_64}/nptl/tls.h)
if (hasStackGuardSlotTLS(Subtarget.getTargetTriple())) {
if (Subtarget.isTargetFuchsia()) {
// <magenta/tls.h> defines MX_TLS_STACK_GUARD_OFFSET with this value.
// <zircon/tls.h> 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()) {
// <magenta/tls.h> defines MX_TLS_UNSAFE_SP_OFFSET with this value.
// <zircon/tls.h> defines ZX_TLS_UNSAFE_SP_OFFSET with this value.
return SegmentOffset(IRB, 0x18, getAddressSpace());
}

0 comments on commit b684580

Please sign in to comment.