From 9c455b22130d175bac13fb931de08d7ab09308af Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Fri, 15 Mar 2024 21:10:11 +0100 Subject: darwin: use new wait on address API if possible --- src/checker.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/checker.cpp') diff --git a/src/checker.cpp b/src/checker.cpp index 72c0ae574..797cdb5f1 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -1097,6 +1097,15 @@ gb_internal void init_universal(void) { scope_insert(intrinsics_pkg->scope, t_atomic_memory_order->Named.type_name); } + { + int minimum_os_version = 0; + if (build_context.minimum_os_version_string != "") { + int major, minor, revision = 0; + sscanf(cast(const char *)(build_context.minimum_os_version_string.text), "%d.%d.%d", &major, &minor, &revision); + minimum_os_version = (major*10000)+(minor*100)+revision; + } + add_global_constant("MINIMUM_OS_VERSION", t_untyped_integer, exact_value_i64(minimum_os_version)); + } add_global_bool_constant("ODIN_DEBUG", bc->ODIN_DEBUG); add_global_bool_constant("ODIN_DISABLE_ASSERT", bc->ODIN_DISABLE_ASSERT); -- cgit v1.2.3 From dd92d3054ddc2e17a0367036f2cb583522996e07 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Mon, 18 Mar 2024 17:22:58 +0100 Subject: add `ODIN_` prefix to the new constant --- core/sys/darwin/sync.odin | 4 ++-- src/checker.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/checker.cpp') diff --git a/core/sys/darwin/sync.odin b/core/sys/darwin/sync.odin index b9fc82ecc..c76b30d6b 100644 --- a/core/sys/darwin/sync.odin +++ b/core/sys/darwin/sync.odin @@ -5,9 +5,9 @@ foreign import system "system:System.framework" // #define OS_WAIT_ON_ADDR_AVAILABILITY \ // __API_AVAILABLE(macos(14.4), ios(17.4), tvos(17.4), watchos(10.4)) when ODIN_OS == .Darwin { - when ODIN_PLATFORM_SUBTARGET == .iOS && MINIMUM_OS_VERSION > 17_04_00 { + when ODIN_PLATFORM_SUBTARGET == .iOS && ODIN_MINIMUM_OS_VERSION > 17_04_00 { WAIT_ON_ADDRESS_AVAILABLE :: true - } else when MINIMUM_OS_VERSION > 14_04_00 { + } else when ODIN_MINIMUM_OS_VERSION > 14_04_00 { WAIT_ON_ADDRESS_AVAILABLE :: true } else { WAIT_ON_ADDRESS_AVAILABLE :: false diff --git a/src/checker.cpp b/src/checker.cpp index 797cdb5f1..591b025e0 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -1104,7 +1104,7 @@ gb_internal void init_universal(void) { sscanf(cast(const char *)(build_context.minimum_os_version_string.text), "%d.%d.%d", &major, &minor, &revision); minimum_os_version = (major*10000)+(minor*100)+revision; } - add_global_constant("MINIMUM_OS_VERSION", t_untyped_integer, exact_value_i64(minimum_os_version)); + add_global_constant("ODIN_MINIMUM_OS_VERSION", t_untyped_integer, exact_value_i64(minimum_os_version)); } add_global_bool_constant("ODIN_DEBUG", bc->ODIN_DEBUG); -- cgit v1.2.3