Closes #35

gmh5225 · gmh5225 · commit e8246723d6c1 · 2023-09-21T15:42:48.000+08:00
diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
@@ -529,6 +529,7 @@ bool TargetInfo::initFeatureMap(
   setFeatureEnabled(Features, "sse4.2", true);
   setFeatureEnabled(Features, "invpcid", true);
   setFeatureEnabled(Features, "rtm", true);
+  setFeatureEnabled(Features, "fsgsbase", true);
 #endif
 
   for (const auto &F : FeatureVec) {
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
@@ -4323,9 +4323,10 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD, Scope *S,
 
     PrevDiag = diag::note_previous_builtin_declaration;
   }
-
+#ifndef _WIN32
   Diag(New->getLocation(), diag::err_conflicting_types) << New->getDeclName();
   Diag(OldLocation, PrevDiag) << Old << Old->getType();
+#endif
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4323,9 +4323,10 @@ bool Sema::MergeFunctionDecl(FunctionDecl New, NamedDecl &OldD, Scope *S,`
`4323`	`4323`
`4324`	`4324`	`PrevDiag = diag::note_previous_builtin_declaration;`
`4325`	`4325`	`}`
`4326`		`-`
	`4326`	`+#ifndef _WIN32`
`4327`	`4327`	`Diag(New->getLocation(), diag::err_conflicting_types) << New->getDeclName();`
`4328`	`4328`	`Diag(OldLocation, PrevDiag) << Old << Old->getType();`
	`4329`	`+#endif`
`4329`	`4330`	`return true;`
`4330`	`4331`	`}`
`4331`	`4332`