summaryrefslogtreecommitdiff
path: root/www/librewolf/files/patch-i386-protobuf-alignment
diff options
context:
space:
mode:
authorMartin Filla <freebsd@sysctl.cz>2023-01-19 19:52:57 +0100
committerJesper Schmitz Mouridsen <jsm@FreeBSD.org>2023-01-21 19:34:48 +0100
commit4e77dee79c17245e0c3b4b98af5a718ed2c5eb81 (patch)
tree1af2a1c76c0c6d33307e7456f888546cf0ded567 /www/librewolf/files/patch-i386-protobuf-alignment
parentsecurity/openscep: Mark DEPRECATED (diff)
www/librewolf: New port
PR: 258503
Diffstat (limited to 'www/librewolf/files/patch-i386-protobuf-alignment')
-rw-r--r--www/librewolf/files/patch-i386-protobuf-alignment15
1 files changed, 15 insertions, 0 deletions
diff --git a/www/librewolf/files/patch-i386-protobuf-alignment b/www/librewolf/files/patch-i386-protobuf-alignment
new file mode 100644
index 000000000000..0d58c8644e79
--- /dev/null
+++ b/www/librewolf/files/patch-i386-protobuf-alignment
@@ -0,0 +1,15 @@
+# On FreeBSD/i386's LLVM, actual alignment for atomic types requires
+# stricter alignment rules, mostly on 8 byte boundaries instead of 4 byte
+# as indicated by max_align_t.
+
+--- ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h.orig 2022-08-20 20:07:57.096818000 +0200
++++ ./toolkit/components/protobuf/src/google/protobuf/arena_impl.h 2022-08-20 21:40:47.821690000 +0200
+@@ -640,7 +640,7 @@
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4324)
+ #endif
+- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
++ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator {
+ std::atomic<LifecycleIdAtomic> id;
+ };
+ static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;