diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-03 22:46:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 22:46:27 -0800 |
| commit | 75e24fa12478581919b7e65cddaffb87ead2a5a7 (patch) | |
| tree | 2144b810de92fc7d9f7662fd45b63512547b0997 /ports/abseil/fix-uwp-build.patch | |
| parent | 53f9a328a9b1a94514ef29a51ccb342456ea0f0a (diff) | |
| download | vcpkg-75e24fa12478581919b7e65cddaffb87ead2a5a7.tar.gz vcpkg-75e24fa12478581919b7e65cddaffb87ead2a5a7.zip | |
[abseil] Revert changes about arm build (#14109)
Diffstat (limited to 'ports/abseil/fix-uwp-build.patch')
| -rw-r--r-- | ports/abseil/fix-uwp-build.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/ports/abseil/fix-uwp-build.patch b/ports/abseil/fix-uwp-build.patch deleted file mode 100644 index a9b4a0c07..000000000 --- a/ports/abseil/fix-uwp-build.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc -index a0930e9..2ec5793 100644 ---- a/absl/base/internal/sysinfo.cc -+++ b/absl/base/internal/sysinfo.cc -@@ -72,6 +72,12 @@ static int GetNumCPUs() { - #if defined(_WIN32) - - static double GetNominalCPUFrequency() { -+// UWP apps don't have access to the registry and currently don't provide an -+// API informing about CPU nominal frequency. -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ -+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ return 1.0; -+#else - #pragma comment(lib, "advapi32.lib") // For Reg* functions. - HKEY key; - // Use the Reg* functions rather than the SH functions because shlwapi.dll -@@ -91,6 +97,7 @@ static double GetNominalCPUFrequency() { - } - } - return 1.0; -+#endif // WINAPI_PARTITION_APP && !WINAPI_PARTITION_DESKTOP - } - - #elif defined(CTL_HW) && defined(HW_CPU_FREQ) -diff --git a/absl/debugging/symbolize_win32.inc b/absl/debugging/symbolize_win32.inc -index c3df46f..d324fc1 100644 ---- a/absl/debugging/symbolize_win32.inc -+++ b/absl/debugging/symbolize_win32.inc -@@ -36,6 +36,11 @@ ABSL_NAMESPACE_BEGIN - static HANDLE process = NULL; - - void InitializeSymbolizer(const char*) { -+// UWP doesn't support this function -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ -+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ return; -+#else - if (process != nullptr) { - return; - } -@@ -52,9 +57,16 @@ void InitializeSymbolizer(const char*) { - const unsigned long long error{GetLastError()}; // NOLINT(runtime/int) - ABSL_RAW_LOG(FATAL, "SymInitialize() failed: %llu", error); - } -+#endif - } - - bool Symbolize(const void* pc, char* out, int out_size) { -+ -+// UWP doesn't support this function -+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ -+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -+ return false; -+#else - if (out_size <= 0) { - return false; - } -@@ -75,6 +87,7 @@ bool Symbolize(const void* pc, char* out, int out_size) { - out[out_size - 1] = '\0'; - } - return true; -+#endif - } - - ABSL_NAMESPACE_END |
