Simplify a short/long message with just "invalid"

Author: MaskRay

lld/ELF/InputFiles.cpp

@@ -979,16 +979,15 @@ void readGnuProperty(const InputSection &sec, ObjFile<ELFT> &f) {
         f.andFeatures |= read32<ELFT::Endianness>(desc.data());
       } else if (config->emachine == EM_AARCH64 &&
                  type == GNU_PROPERTY_AARCH64_FEATURE_PAUTH) {
-        if (!f.aarch64PauthAbiCoreInfo.empty())
+        if (!f.aarch64PauthAbiCoreInfo.empty()) {
           reportFatal(data.data(),
                       "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
                       "not supported");
-        if (size != 16)
-          reportFatal(
-              data.data(),
-              Twine("GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry is too ") +
-                  (size < 16 ? "short" : "long") +
-                  ": expected 16 bytes, but got " + Twine(size));
+        } else if (size != 16) {
+          reportFatal(data.data(), "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
+                                   "is invalid: expected 16 bytes, but got " +
+                                       Twine(size));
+        }
         f.aarch64PauthAbiCoreInfo = desc;
       }
 

lld/test/ELF/aarch64-feature-pauth.s

@@ -19,12 +19,12 @@
 # RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag-short.s -o short.o
 # RUN: not ld.lld short.o -o /dev/null 2>&1 | FileCheck --check-prefix ERR2 %s
 
-# ERR2: error: short.o:(.note.gnu.property+0x0): GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry is too short: expected 16 bytes, but got 12
+# ERR2: error: short.o:(.note.gnu.property+0x0): GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry is invalid: expected 16 bytes, but got 12
 
 # RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag-long.s -o long.o
 # RUN: not ld.lld long.o -o /dev/null 2>&1 | FileCheck --check-prefix ERR3 %s
 
-# ERR3: error: long.o:(.note.gnu.property+0x0): GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry is too long: expected 16 bytes, but got 24
+# ERR3: error: long.o:(.note.gnu.property+0x0): GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry is invalid: expected 16 bytes, but got 24
 
 # RUN: llvm-mc -filetype=obj -triple=aarch64-linux-gnu abi-tag-multiple.s -o multiple.o
 # RUN: not ld.lld multiple.o -o /dev/null 2>&1 | FileCheck --check-prefix ERR4 %s