From 764ad1090b1d78c3e2636b2446e6ebbce9bc76a1 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 1 Jun 2023 22:28:53 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (10.7) quilt-fixup] --- ...054c4645bf0a4d44302ffa8e47a815c-1685658533 | 45 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 debian/patches/auto-3.4.1-1+rpi1-f83e8d276054c4645bf0a4d44302ffa8e47a815c-1685658533 create mode 100644 debian/patches/series diff --git a/debian/patches/auto-3.4.1-1+rpi1-f83e8d276054c4645bf0a4d44302ffa8e47a815c-1685658533 b/debian/patches/auto-3.4.1-1+rpi1-f83e8d276054c4645bf0a4d44302ffa8e47a815c-1685658533 new file mode 100644 index 0000000..5e3d252 --- /dev/null +++ b/debian/patches/auto-3.4.1-1+rpi1-f83e8d276054c4645bf0a4d44302ffa8e47a815c-1685658533 @@ -0,0 +1,45 @@ +From: Peter Michael Green +Subject: Automatically generated patch (3.4.1-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit f83e8d276054c4645bf0a4d44302ffa8e47a815c +Merge: 16bde11 6024b18 +Author: Peter Michael Green +Date: Thu Jun 1 22:24:24 2023 +0000 + + Manual merge of version 3.3.0-4+rpi1 and 3.4.1-1 to produce 3.4.1-1+rpi1 + +commit 6024b1804ef2af92f00c824447d12864297ec926 +Merge: 89c5168 4608e8f +Author: Victor Seva +Date: Tue Oct 25 23:37:32 2022 +0100 + + Merge nats.c (3.4.1-1) import into refs/heads/workingbranch + +commit 89c516801966343ebf1317e4664b2a9e9c4ba72d +Merge: 31e8699 ec07898 +Author: Victor Seva +Date: Tue Oct 25 23:37:32 2022 +0100 + + nats.c (3.4.1-1) unstable; urgency=medium + + * New upstream version 3.4.1 + * update symbols + + [dgit import unpatched nats.c 3.4.1-1] +--- + +diff --git a/src/unix/mutex.c b/src/unix/mutex.c +index ddc6a56..1913a82 100644 +--- a/src/unix/mutex.c ++++ b/src/unix/mutex.c +@@ -78,7 +78,7 @@ natsMutex_Lock(natsMutex *m) + #if defined(__x86_64__) || \ + defined(__mips__) + __asm__ __volatile__ ("pause" ::: "memory"); +- #elif (defined(__arm__) && __ARM_ARCH >=6) || \ ++ #elif (defined(__arm__) && __ARM_ARCH >=7) || \ + defined(__aarch64__) + __asm__ __volatile__ ("yield" ::: "memory"); + #elif defined(__powerpc__) || \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f6f5dce --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +auto-3.4.1-1+rpi1-f83e8d276054c4645bf0a4d44302ffa8e47a815c-1685658533 -- 2.30.2