Skip to content

Better support for mingw-w64 and GCC-compatible compilers #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2022
Merged

Better support for mingw-w64 and GCC-compatible compilers #1212

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afb474f
[GNUC] Use __sync builtin instead of MSVC intrinsic
alvinhochun Oct 20, 2022
d10e798
[GNUC][ARM] Assemble `dmb ish` instead of using __dmb intrinsic
alvinhochun Oct 20, 2022
6187508
[GNUC] Don't use __iso_volatile_load32/64
alvinhochun Oct 20, 2022
97bf5a1
Merge branch 'master' into alvin/mingw
kennykerr Oct 20, 2022
dae26a4
Fix copy-and-paste error
alvinhochun Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions strings/base_activation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ WINRT_EXPORT namespace winrt
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif

#if defined _M_ARM
#if defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))
#define WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER __asm__ __volatile__ ("dmb ish");
#elif defined _M_ARM
#define WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER (__dmb(_ARM_BARRIER_ISH));
#elif defined _M_ARM64
#define WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER (__dmb(_ARM64_BARRIER_ISH));
Expand All @@ -143,7 +145,11 @@ namespace winrt::impl
_ReadWriteBarrier();
return result;
#elif defined _M_ARM || defined _M_ARM64
#if defined(__GNUC__)
int32_t const result = *target;
#else
int32_t const result = __iso_volatile_load32(reinterpret_cast<int32_t const volatile*>(target));
#endif
WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER
return result;
#else
Expand All @@ -159,7 +165,11 @@ namespace winrt::impl
_ReadWriteBarrier();
return result;
#elif defined _M_ARM64
#if defined(__GNUC__)
int64_t const result = *target;
#else
int64_t const result = __iso_volatile_load64(target);
#endif
WINRT_IMPL_INTERLOCKED_READ_MEMORY_BARRIER
return result;
#else
Expand Down Expand Up @@ -281,7 +291,12 @@ namespace winrt::impl
object_and_count current_value{ pointer_value, 0 };

#if defined _WIN64
if (1 == _InterlockedCompareExchange128((int64_t*)this, 0, 0, (int64_t*)&current_value))
#if defined(__GNUC__)
bool exchanged = __sync_bool_compare_and_swap((__int128*)this, *(__int128*)&current_value, (__int128)0);
#else
bool exchanged = 1 == _InterlockedCompareExchange128((int64_t*)this, 0, 0, (int64_t*)&current_value);
#endif
if (exchanged)
{
pointer_value->Release();
}
Expand Down