Skip to content

Commit 9cb40b2

Browse files
Auto-update quill to v4.5.0 (#4529)
* Update quill to v4.5.0 * add patch --------- Co-authored-by: star9029 <[email protected]>
1 parent 3e574e7 commit 9cb40b2

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff --git a/quill/include/quill/core/Rdtsc.h b/quill/include/quill/core/Rdtsc.h
2+
index 2a5203b..17b92b7 100644
3+
--- a/quill/include/quill/core/Rdtsc.h
4+
+++ b/quill/include/quill/core/Rdtsc.h
5+
@@ -45,7 +45,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
6+
__asm__ volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
7+
return static_cast<uint64_t>(virtual_timer_value);
8+
}
9+
-#elif defined(__ARM_ARCH)
10+
+#elif (defined(__ARM_ARCH) && !defined(_MSC_VER))
11+
QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
12+
{
13+
#if (__ARM_ARCH >= 6)
14+
@@ -69,13 +69,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
15+
// soft failover
16+
return static_cast<uint64_t>(std::chrono::system_clock::now().time_since_epoch().count());
17+
}
18+
-#elif (defined(_M_ARM) || defined(_M_ARM64))
19+
-QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
20+
-{
21+
- // soft failover
22+
- return static_cast<uint64_t>(std::chrono::system_clock::now().time_since_epoch().count());
23+
-}
24+
-#elif (defined(__PPC64__))
25+
+#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__))
26+
QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
27+
{
28+
// soft failover

packages/q/quill/xmake.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package("quill")
66
set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz",
77
"https://github.com/odygrd/quill.git")
88

9+
add_versions("v4.5.0", "70e8f4a76fd8a83b60d378f31b70dd09a9381686ebafdcd0db08fe099f518309")
910
add_versions("v4.3.0", "c97bf3bfac6dfb7ed77fa08d945a490e302ba07e405539fda61985b39750cb29")
1011
add_versions("v3.8.0", "d3e1b349c5d6904c9644e5b79ec65f21692e8094a3d75241a7fe071076eef4dd")
1112
add_versions("v3.6.0", "ba9dc3df262f2e65c57904580cc8407eba9a462001340c17bab7ae1dccddb4bd")
@@ -14,6 +15,8 @@ package("quill")
1415
add_versions("v2.9.1", "921e053118136f63cebb2ca1d7e42456fd0bf9626facb755884709092753c054")
1516
add_versions("v2.8.0", "0461a6c314e3d882f3b9ada487ef1bf558925272509ee41a9fd25f7776db6075")
1617

18+
add_patches("4.5.0", "patches/4.5.0/windows-arm.patch", "e7db1f07e1eea048798283f9865842c4754ed3d1ff220954cadd392ad4450cc3")
19+
1720
if is_plat("macosx") then
1821
add_extsources("brew::quill")
1922
end

0 commit comments

Comments
 (0)