Merge commit 'cface67832a4' from swift/release/5.5 into swift/main

git apple-llvm automerger · git apple-llvm automerger · commit 6dc8a96243ed · 2021-07-14T15:00:35.000-07:00
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp
@@ -1309,7 +1309,7 @@ int computeHostNumPhysicalCores() {
 }
 #elif defined(__linux__) && defined(__s390x__)
 int computeHostNumPhysicalCores() { return sysconf(_SC_NPROCESSORS_ONLN); }
-#elif defined(__APPLE__) && defined(__x86_64__)
+#elif defined(__APPLE__)
 #include <sys/param.h>
 #include <sys/sysctl.h>
 

Original file line number	Diff line number	Diff line change
`@@ -1309,7 +1309,7 @@ int computeHostNumPhysicalCores() {`
`1309`	`1309`	`}`
`1310`	`1310`	`#elif defined(__linux__) && defined(__s390x__)`
`1311`	`1311`	`int computeHostNumPhysicalCores() { return sysconf(_SC_NPROCESSORS_ONLN); }`
`1312`		`-#elif defined(__APPLE__) && defined(__x86_64__)`
	`1312`	`+#elif defined(__APPLE__)`
`1313`	`1313`	`#include <sys/param.h>`
`1314`	`1314`	`#include <sys/sysctl.h>`
`1315`	`1315`