mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

www/firefox: fix build on i386

Browse Source 
The included protobuf tries to figure out optimal memory alignment
for some variables, but on i386 our library is not really helpful
with that. Adjust the alignment for the problematic case, and disable
one static_assert() checking for alignment values (borrowed from
devel/protobuf port).

(cherry picked from commit 0e5839c5f4)
This commit is contained in:
Christoph Moench-Tegeder 2022-08-20 23:20:00 +02:00
parent c612fb44d4
commit 1ac3ac5740
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
www/firefox/files/patch-i386-protobuf-alignment Normal file
View File

@ -0,0 +1,29 @@
# 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.
# Patch for arenastring.cc borrowed from devel/protobuf/files/patch-i386
--- toolkit/components/protobuf/src/google/protobuf/arenastring.cc.orig 2022-08-20 22:07:01.600662000 +0200
+++ toolkit/components/protobuf/src/google/protobuf/arenastring.cc 2022-08-20 22:07:55.969192000 +0200
@@ -64,7 +64,8 @@
#endif
constexpr size_t kStringAlign = alignof(std::string);
-static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
+// this does not hold with llvm on FreeBSD/i386
+// static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, "");
} // namespace
--- ./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_;