Merge pull request #39098 from aschwaighofer/disable_global_isel_arm64e

swift-ci · web-flow · commit af9b5b944c9d · 2021-08-30T15:40:48.000-07:00
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1885,7 +1885,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
 
   if (SWIFT_ENABLE_GLOBAL_ISEL_ARM64 &&
       (Triple.getArch() == llvm::Triple::aarch64 ||
-       Triple.getArch() == llvm::Triple::aarch64_32)) {
+       Triple.getArch() == llvm::Triple::aarch64_32) &&
+      Triple.getArchName() != "arm64e") {
     Opts.EnableGlobalISel = true;
   }
 
diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -139,7 +139,6 @@ function(_add_target_variant_c_compile_flags)
   set(result ${${CFLAGS_RESULT_VAR_NAME}})
 
   if ("${CFLAGS_ARCH}" STREQUAL "arm64" OR
-      "${CFLAGS_ARCH}" STREQUAL "arm64e" OR
       "${CFLAGS_ARCH}" STREQUAL "arm64_32")
     if (SWIFT_ENABLE_GLOBAL_ISEL_ARM64)
       list(APPEND result "-fglobal-isel")

Original file line number	Diff line number	Diff line change
`@@ -1885,7 +1885,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,`
`1885`	`1885`
`1886`	`1886`	`if (SWIFT_ENABLE_GLOBAL_ISEL_ARM64 &&`
`1887`	`1887`	`(Triple.getArch() == llvm::Triple::aarch64 \|\|`
`1888`		`- Triple.getArch() == llvm::Triple::aarch64_32)) {`
	`1888`	`+ Triple.getArch() == llvm::Triple::aarch64_32) &&`
	`1889`	`+ Triple.getArchName() != "arm64e") {`
`1889`	`1890`	`Opts.EnableGlobalISel = true;`
`1890`	`1891`	`}`
`1891`	`1892`