Admins will be upgrading ORNL GitLab Servers on Saturday, 16 May 2026, from 7 AM until 11 AM EST. Repositories will experience intermittent outages during this time.

Commit 2b0e6fe2 authored Jan 28, 2020 by Roland McGrath Committed by Petr Hosek Jan 28, 2020

[Fuchsia] Remove aarch64-fuchsia target-specific -mcmodel=kernel

Under --target=aarch64-fuchsia, -mcmodel=kernel has the effect of
(the default) -mcmodel=small plus -mtp=el1 (which did not exist when
this behavior was added). Fuchsia's kernel now uses -mtp=el1
directly instead of -mcmodel=kernel, so remove this special support.

Patch By: mcgrathr

Differential Revision: https://reviews.llvm.org/D73409

parent 16e82d85

llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -615,10 +615,7 @@ bool AArch64ExpandPseudo::expandMI(MachineBasicBlock &MBB,
		Register DstReg = MI.getOperand(0).getReg();
		auto SysReg = AArch64SysReg::TPIDR_EL0;
		MachineFunction *MF = MBB.getParent();
		if (MF->getTarget().getTargetTriple().isOSFuchsia() &&
		MF->getTarget().getCodeModel() == CodeModel::Kernel)
		SysReg = AArch64SysReg::TPIDR_EL1;
		else if (MF->getSubtarget<AArch64Subtarget>().useEL3ForTP())
		if (MF->getSubtarget<AArch64Subtarget>().useEL3ForTP())
		SysReg = AArch64SysReg::TPIDR_EL3;
		else if (MF->getSubtarget<AArch64Subtarget>().useEL2ForTP())
		SysReg = AArch64SysReg::TPIDR_EL2;

llvm/lib/Target/AArch64/AArch64TargetMachine.cpp

+2 −6

Original line number	Diff line number	Diff line
		@@ -236,12 +236,8 @@ getEffectiveAArch64CodeModel(const Triple &TT, Optional<CodeModel::Model> CM,
		if (CM) {
		if (CM != CodeModel::Small && CM != CodeModel::Tiny &&
		*CM != CodeModel::Large) {
		if (!TT.isOSFuchsia())
		report_fatal_error(
		"Only small, tiny and large code models are allowed on AArch64");
		else if (*CM != CodeModel::Kernel)
		report_fatal_error("Only small, tiny, kernel, and large code models "
		"are allowed on AArch64");
		} else if (*CM == CodeModel::Tiny && !TT.isOSBinFormatELF())
		report_fatal_error("tiny code model is only supported on ELF");
		return *CM;

llvm/test/CodeGen/AArch64/arm64-builtins-linux.ll

+0 −3

Original line number	Diff line number	Diff line
		; RUN: llc < %s -mtriple=aarch64-linux-gnu \| FileCheck %s
		; RUN: llc < %s -mtriple=aarch64-fuchsia \| FileCheck %s
		; RUN: llc < %s -mtriple=aarch64-fuchsia -code-model=kernel \| FileCheck --check-prefix=FUCHSIA-KERNEL %s
		; RUN: llc < %s -mtriple=aarch64-linux-gnu -mattr=+tpidr-el1 \| FileCheck --check-prefix=USEEL1 %s
		; RUN: llc < %s -mtriple=aarch64-linux-gnu -mattr=+tpidr-el2 \| FileCheck --check-prefix=USEEL2 %s
		; RUN: llc < %s -mtriple=aarch64-linux-gnu -mattr=+tpidr-el3 \| FileCheck --check-prefix=USEEL3 %s
		@@ -11,8 +10,6 @@ declare i8* @llvm.thread.pointer() #1
		define i8* @thread_pointer() {
		; CHECK: thread_pointer:
		; CHECK: mrs {{x[0-9]+}}, TPIDR_EL0
		; FUCHSIA-KERNEL: thread_pointer:
		; FUCHSIA-KERNEL: mrs {{x[0-9]+}}, TPIDR_EL1
		; USEEL1: thread_pointer:
		; USEEL1: mrs {{x[0-9]+}}, TPIDR_EL1
		; USEEL2: thread_pointer:

llvm/test/CodeGen/AArch64/arm64-elf-globals.ll

+4 −4

Original line number	Diff line number	Diff line
		@@ -2,10 +2,10 @@
		; RUN: llc -mtriple=arm64-linux-gnu -o - %s -O0 -fast-isel -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST
		; RUN: llc -mtriple=arm64-linux-gnu -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-PIC
		; RUN: llc -mtriple=arm64-linux-gnu -O0 -fast-isel -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST-PIC
		; RUN: llc -mtriple=aarch64-fuchsia -code-model=kernel -o - %s -mcpu=cyclone \| FileCheck %s
		; RUN: llc -mtriple=aarch64-fuchsia -code-model=kernel -o - %s -O0 -fast-isel -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST
		; RUN: llc -mtriple=aarch64-fuchsia -code-model=kernel -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-PIC
		; RUN: llc -mtriple=aarch64-fuchsia -code-model=kernel -O0 -fast-isel -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST-PIC
		; RUN: llc -mtriple=aarch64-fuchsia -o - %s -mcpu=cyclone \| FileCheck %s
		; RUN: llc -mtriple=aarch64-fuchsia -o - %s -O0 -fast-isel -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST
		; RUN: llc -mtriple=aarch64-fuchsia -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-PIC
		; RUN: llc -mtriple=aarch64-fuchsia -O0 -fast-isel -relocation-model=pic -o - %s -mcpu=cyclone \| FileCheck %s --check-prefix=CHECK-FAST-PIC

		@var8 = external global i8, align 1
		@var16 = external global i16, align 2

llvm/test/CodeGen/AArch64/stack-protector-target.ll

+1 −1

Original line number	Diff line number	Diff line
		; Test target-specific stack cookie location.
		; RUN: llc -mtriple=aarch64-linux-android < %s -o - \| FileCheck --check-prefix=ANDROID-AARCH64 %s
		; RUN: llc -mtriple=aarch64-fuchsia < %s -o - \| FileCheck --check-prefixes=FUCHSIA-AARCH64-COMMON,FUCHSIA-AARCH64-USER %s
		; RUN: llc -mtriple=aarch64-fuchsia -code-model=kernel < %s -o - \| FileCheck --check-prefixes=FUCHSIA-AARCH64-COMMON,FUCHSIA-AARCH64-KERNEL %s
		; RUN: llc -mtriple=aarch64-fuchsia -mattr=+tpidr-el1 < %s -o - \| FileCheck --check-prefixes=FUCHSIA-AARCH64-COMMON,FUCHSIA-AARCH64-KERNEL %s
		; RUN: llc -mtriple=aarch64-windows < %s -o - \| FileCheck --check-prefix=WINDOWS-AARCH64 %s

		define void @_Z1fv() sspreq {