diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 00:47:55 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 00:47:55 +0000 |
commit | 26a029d407be480d791972afb5975cf62c9360a6 (patch) | |
tree | f435a8308119effd964b339f76abb83a57c29483 /toolkit/components/protobuf/14174.patch | |
parent | Initial commit. (diff) | |
download | firefox-26a029d407be480d791972afb5975cf62c9360a6.tar.xz firefox-26a029d407be480d791972afb5975cf62c9360a6.zip |
Adding upstream version 124.0.1.upstream/124.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/protobuf/14174.patch')
-rw-r--r-- | toolkit/components/protobuf/14174.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/toolkit/components/protobuf/14174.patch b/toolkit/components/protobuf/14174.patch new file mode 100644 index 0000000000..37b6117f5b --- /dev/null +++ b/toolkit/components/protobuf/14174.patch @@ -0,0 +1,38 @@ +From 292f3191dc63394cac1dbe9b31843ca3bd287812 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <sguelton@mozilla.com> +Date: Fri, 22 Sep 2023 10:06:44 +0200 +Subject: [PATCH] Remove <iostream> from the common.h header + +<iostream> embeds a global constructor (to initialize std::cout and +such), typically `static ios_base::Init __ioinit;` in libstdc++). + +This header is not directly necessary in the common header and has a +small impact on every compilation unit that includes it. + +As an example, removing that header dependency in turns suppresses 33 global +constructors from the firefox core library libxul. +--- +diff --git a/toolkit/components/protobuf/src/google/protobuf/message_lite.cc b/toolkit/components/protobuf/src/google/protobuf/message_lite.cc +index da66c1965b4c4..a1790b167fdbd 100644 +--- a/toolkit/components/protobuf/src/google/protobuf/message_lite.cc ++++ b/toolkit/components/protobuf/src/google/protobuf/message_lite.cc +@@ -38,6 +38,7 @@ + #include <climits> + #include <cstdint> + #include <string> ++#include <istream> + + #include <google/protobuf/stubs/logging.h> + #include <google/protobuf/stubs/common.h> +diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/common.h b/toolkit/components/protobuf/src/google/protobuf/stubs/common.h +index ebb1ca0e677cc..58739784db804 100644 +--- a/toolkit/components/protobuf/src/google/protobuf/stubs/common.h ++++ b/toolkit/components/protobuf/src/google/protobuf/stubs/common.h +@@ -36,7 +36,6 @@ + #define GOOGLE_PROTOBUF_COMMON_H__ + + #include <algorithm> +-#include <iostream> + #include <map> + #include <memory> + #include <set> |