Merge commit '6be9acdfa814' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit 934f29a18a51 · 2020-01-30T15:02:38.000+01:00
diff --git a/llvm/test/CodeGen/AArch64/global-merge-hidden-minsize.ll b/llvm/test/CodeGen/AArch64/global-merge-hidden-minsize.ll
@@ -1,4 +1,3 @@
-; RUN: llc %s -mtriple=arm-none-linux-gnu -o - | FileCheck %s
 ; RUN: llc %s -mtriple=aarch64-none-linux-gnu -o - | FileCheck %s
 
 @x = hidden global i32 0, align 4

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-; RUN: llc %s -mtriple=arm-none-linux-gnu -o - \| FileCheck %s`
`2`	`1`	`; RUN: llc %s -mtriple=aarch64-none-linux-gnu -o - \| FileCheck %s`
`3`	`2`
`4`	`3`	`@x = hidden global i32 0, align 4`