Index: llvm/lib/Support/RISCVISAInfo.cpp
===================================================================
--- llvm/lib/Support/RISCVISAInfo.cpp
+++ llvm/lib/Support/RISCVISAInfo.cpp
@@ -626,6 +626,10 @@
     break;
   }
 
+  if (Arch.back() == '_')
+    return createStringError(errc::invalid_argument,
+                             "invalid format - trailing underscore");
+
   // Skip rvxxx
   StringRef Exts = Arch.substr(5);
 
Index: llvm/unittests/Support/RISCVISAInfoTest.cpp
===================================================================
--- llvm/unittests/Support/RISCVISAInfoTest.cpp
+++ llvm/unittests/Support/RISCVISAInfoTest.cpp
@@ -317,16 +317,14 @@
   EXPECT_EQ(
       toString(RISCVISAInfo::parseArchString("rv64i__m", true).takeError()),
       "invalid standard user-level extension '_'");
-  EXPECT_EQ(
-      toString(RISCVISAInfo::parseArchString("rv32ezicsr_", true).takeError()),
-      "extension name missing after separator '_'");
-
-  // FIXME: Trailing underscores after single letter extensions are accepted,
-  // which is inconsistent.
-  ASSERT_THAT_EXPECTED(RISCVISAInfo::parseArchString("rv32i_", true),
-                       Succeeded());
-  ASSERT_THAT_EXPECTED(RISCVISAInfo::parseArchString("rv64im_", true),
-                       Succeeded());
+  EXPECT_EQ(toString(RISCVISAInfo::parseArchString("rv32ezicsr__zifencei", true)
+                         .takeError()),
+            "extension name missing after separator '_'");
+
+  for (StringRef Input : {"rv32i_", "rv32izicsr_", "rv64im_"}) {
+    EXPECT_EQ(toString(RISCVISAInfo::parseArchString(Input, true).takeError()),
+              "invalid format - trailing underscore");
+  }
 }
 
 TEST(ParseArchString, RejectsDuplicateExtensionNames) {