diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index 7a54d27ef9d8ee2d407109606c644feca7b9cdf9..e505203bdbabce0f633e9d5b75398b81d7ea41f1 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -355,13 +355,22 @@ void DiagnosticsEngine::setSeverity(diag::kind Diag, diag::Severity Map,
                                     SourceLocation L) {
   assert(Diag < diag::DIAG_UPPER_LIMIT &&
          "Can only map builtin diagnostics");
+#ifdef BUILD_FOR_OPENEULER
+  if (!(DiagOpts->GccCompatible)) {
+#endif
   assert((Diags->isBuiltinWarningOrExtension(Diag) ||
           (Map == diag::Severity::Fatal || Map == diag::Severity::Error)) &&
          "Cannot map errors into warnings!");
+#ifdef BUILD_FOR_OPENEULER
+  }
+#endif         
   assert((L.isInvalid() || SourceMgr) && "No SourceMgr for valid location");
 
   // Don't allow a mapping to a warning override an error/fatal mapping.
   bool WasUpgradedFromWarning = false;
+#ifdef BUILD_FOR_OPENEULER
+  if (!(DiagOpts->GccCompatible)) {
+#endif  
   if (Map == diag::Severity::Warning) {
     DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag);
     if (Info.getSeverity() == diag::Severity::Error ||
@@ -370,6 +379,9 @@ void DiagnosticsEngine::setSeverity(diag::kind Diag, diag::Severity Map,
       WasUpgradedFromWarning = true;
     }
   }
+#ifdef BUILD_FOR_OPENEULER
+   }
+#endif  
   DiagnosticMapping Mapping = makeUserMapping(Map, L);
   Mapping.setUpgradedFromWarning(WasUpgradedFromWarning);
 
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index 0bd4b01ff79dbbf475697609b688144577f54456..7b3b17a063f1c68eed017425bee7f46bc8421713 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -31,6 +31,9 @@
 #include "clang/Parse/ParseAST.h"
 #include "clang/Sema/HLSLExternalSemaSource.h"
 #include "clang/Sema/MultiplexExternalSemaSource.h"
+#ifdef BUILD_FOR_OPENEULER
+#include "clang/Sema/SemaDiagnostic.h"
+#endif
 #include "clang/Serialization/ASTDeserializationListener.h"
 #include "clang/Serialization/ASTReader.h"
 #include "clang/Serialization/GlobalModuleIndex.h"
@@ -1170,6 +1173,15 @@ void ASTFrontendAction::ExecuteAction() {
   if (!CI.hasSema())
     CI.createSema(getTranslationUnitKind(), CompletionConsumer);
 
+#ifdef BUILD_FOR_OPENEULER
+  if (CI.getLangOpts().GccCompatible) {
+    // error: explicit instantiation cannot have a storage class
+    CI.getSema().Diags.setSeverity(
+        diag::err_explicit_instantiation_storage_class, diag::Severity::Warning,
+        {});
+  }
+#endif
+
   ParseAST(CI.getSema(), CI.getFrontendOpts().ShowStats,
            CI.getFrontendOpts().SkipFunctionBodies);
 }
diff --git a/clang/test/Driver/test-error-compatibility.cpp b/clang/test/Driver/test-error-compatibility.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ec680411af9a5dcf3cb652fa867190c71e38797d
--- /dev/null
+++ b/clang/test/Driver/test-error-compatibility.cpp
@@ -0,0 +1,9 @@
+// REQUIRES: build_for_openeuler
+// RUN:   %clang -fgcc-compatible -c %s 2>&1 | FileCheck -check-prefix=CHECK-error %s
+// RUN: not %clang -c %s 2>&1 | FileCheck -check-prefix=CHECK-error %s
+// CHECK-error: explicit instantiation cannot have a storage class
+
+
+template <typename T> static void func() {}
+template static void func<int>(); // explicit instantiation
+