llvm: try not patching calling convention on i686 Cygwin

This commit is contained in:
Jeremy Drake 2025-04-05 21:33:40 -07:00
parent ec82934d14
commit b9c966a89b
2 changed files with 1 additions and 15 deletions

View File

@ -5,7 +5,6 @@ Subject: [PATCH 2/5] [Clang][Cygwin] Enable few conditions that are shared
with MinGW
---
clang/lib/AST/ItaniumCXXABI.cpp | 2 +-
clang/lib/AST/RecordLayoutBuilder.cpp | 2 +-
clang/lib/CodeGen/CodeGenModule.cpp | 2 +-
clang/lib/CodeGen/ItaniumCXXABI.cpp | 4 ++--
@ -16,19 +15,6 @@ Subject: [PATCH 2/5] [Clang][Cygwin] Enable few conditions that are shared
clang/lib/Sema/SemaTemplate.cpp | 8 ++++----
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/clang/lib/AST/ItaniumCXXABI.cpp b/clang/lib/AST/ItaniumCXXABI.cpp
index a1b2551419f5..d866f6023e14 100644
--- a/clang/lib/AST/ItaniumCXXABI.cpp
+++ b/clang/lib/AST/ItaniumCXXABI.cpp
@@ -236,7 +236,7 @@ public:
CallingConv getDefaultMethodCallConv(bool isVariadic) const override {
const llvm::Triple &T = Context.getTargetInfo().getTriple();
- if (!isVariadic && T.isWindowsGNUEnvironment() &&
+ if (!isVariadic && T.isOSCygMing() &&
T.getArch() == llvm::Triple::x86)
return CC_X86ThisCall;
return Context.getTargetInfo().getDefaultCallingConv();
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index ae6d299024c6..b0a19ea55d6d 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp

View File

@ -65,7 +65,7 @@ sha256sums=('6286c526db3b84ce79292f80118e7e6d3fbd5b5ce3e4a0ebb32b2d205233bd86'
'3e248aa39a7b837d88c69a67c44b0df7b7543669c1e17aa40605a5b5d192155e'
'bf1dc1279694fe85170497e830117304c2cb1a3d8bf742fd537440e40b538270'
'250aa7b7c8d9652210c06fa124ea6469ce3a6b30480414932206bab519013c27'
'5c6bee32203e46bb753bb617010893fda8955bbaf7e6a1f0c787ef51f3677ca4'
'80867a21ba02264f11ee4fa408a871aafbad0e5a930619beadedfb0f6ae89bcb'
'0952f176cc871f2a527f780a5848aa009100402234aca7b855b1060f3229b70e'
'6ef0825e5110e343a4149c353f0f91be1aa7e754241436f8550c7a2e63efbc05'
'5ebf482126196be6ae2764a1b679cf620a1fa3fae3653634907a032f90446d7e'