From baef18dffba1a2f91b47b484ac2233dfcf923f9b Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Wed, 9 Dec 2020 12:14:00 -0800
Subject: [PATCH] [ELF] Reorganize "is only supported on" tests and fix some
 diagnostics

---
 lld/ELF/Driver.cpp                           |  4 ++--
 lld/test/ELF/aarch64-cortex-a53-843419-cli.s | 10 ----------
 lld/test/ELF/ppc64-tocopt-option.s           | 14 --------------
 lld/test/ELF/target-specific-options.s       | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 lld/test/ELF/aarch64-cortex-a53-843419-cli.s
 delete mode 100644 lld/test/ELF/ppc64-tocopt-option.s
 create mode 100644 lld/test/ELF/target-specific-options.s

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 2350a0e3..4c18339 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -317,10 +317,10 @@ static void checkOptions() {
     error("--fix-cortex-a8 is only supported on ARM targets");
 
   if (config->tocOptimize && config->emachine != EM_PPC64)
-    error("--toc-optimize is only supported on the PowerPC64 target");
+    error("--toc-optimize is only supported on PowerPC64 targets");
 
   if (config->pcRelOptimize && config->emachine != EM_PPC64)
-    error("--pcrel--optimize is only supported on the PowerPC64 target");
+    error("--pcrel-optimize is only supported on PowerPC64 targets");
 
   if (config->pie && config->shared)
     error("-shared and -pie may not be used together");
diff --git a/lld/test/ELF/aarch64-cortex-a53-843419-cli.s b/lld/test/ELF/aarch64-cortex-a53-843419-cli.s
deleted file mode 100644
index b19f6c3..0000000
--- a/lld/test/ELF/aarch64-cortex-a53-843419-cli.s
+++ /dev/null
@@ -1,10 +0,0 @@
-// REQUIRES: x86
-// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-// RUN: not ld.lld %t -fix-cortex-a53-843419 -o /dev/null 2>&1 | FileCheck %s
-
-// CHECK: --fix-cortex-a53-843419 is only supported on AArch64 targets
-.globl entry
-.text
-        .quad 0
-entry:
-        ret
diff --git a/lld/test/ELF/ppc64-tocopt-option.s b/lld/test/ELF/ppc64-tocopt-option.s
deleted file mode 100644
index 7849434..0000000
--- a/lld/test/ELF/ppc64-tocopt-option.s
+++ /dev/null
@@ -1,14 +0,0 @@
-# REQUIRES: x86
-
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: not ld.lld %t --toc-optimize -o /dev/null 2>&1 | FileCheck %s
-
-# CHECK: error: --toc-optimize is only supported on the PowerPC64 target
-
-         .global __start
-         .type __start,@function
-
-         .text
-        .quad 0
- __start:
-
diff --git a/lld/test/ELF/target-specific-options.s b/lld/test/ELF/target-specific-options.s
new file mode 100644
index 0000000..7622780
--- /dev/null
+++ b/lld/test/ELF/target-specific-options.s
@@ -0,0 +1,14 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t
+
+# RUN: not ld.lld %t --fix-cortex-a53-843419 -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR-843419
+# ERR-843419: error: --fix-cortex-a53-843419 is only supported on AArch64 targets
+
+# RUN: not ld.lld %t --pcrel-optimize -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR-PCREL
+# ERR-PCREL: error: --pcrel-optimize is only supported on PowerPC64 targets
+
+# RUN: not ld.lld %t --toc-optimize -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR-TOC
+# ERR-TOC: error: --toc-optimize is only supported on PowerPC64 targets
+
+.globl _start
+_start:
-- 
2.7.4