diff options
| author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-09-15 21:12:36 +0000 |
|---|---|---|
| committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-09-15 21:15:45 +0000 |
| commit | 1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6 (patch) | |
| tree | 80ee417628af149c25de7d1e572e7f83400c32a8 | |
| parent | 88af0691406d89c70a5b8839f6dd690e2b315ac1 (diff) | |
| download | ports-1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6.tar.gz ports-1eca35157e9dda8f83d0d672d4ecfc6a5cfdf3d6.zip | |
www/firefox: fix build on i386 (again)
upstream fix for alignment issues in embedded protobuf was not complete
Reported by: fallout
(cherry picked from commit ac39d32256828d37b4dd99a2458298aa90010db2)
| -rw-r--r-- | www/firefox/files/patch-i386-protobuf-alignment | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/www/firefox/files/patch-i386-protobuf-alignment b/www/firefox/files/patch-i386-protobuf-alignment new file mode 100644 index 000000000000..0d58c8644e79 --- /dev/null +++ b/www/firefox/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_; |