diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2024-05-16 16:15:25 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2024-05-16 16:15:25 -0400 |
| commit | 23778b53f420f54eebc195dd8430e79bda165e5b (patch) | |
| tree | d5840c9cf57fc96b95741c967aa0b821d9be97ca | |
| parent | e499baa910331b1f60a9145b69e4d4ab86a8bcf1 (diff) | |
Backport an upstream patch to enable demangling on mips64el20240116.2-2
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/mips-cxa-demangle.diff | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 21991859..275c8bb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +abseil (20240116.2-2) experimental; urgency=medium + + * Backport an upstream patch to enable demangling on mips64el. + + -- Benjamin Barenblat <bbaren@debian.org> Thu, 16 May 2024 16:15:02 -0400 + abseil (20240116.2-1) experimental; urgency=medium * New upstream release. diff --git a/debian/patches/mips-cxa-demangle.diff b/debian/patches/mips-cxa-demangle.diff new file mode 100644 index 00000000..81a5cbac --- /dev/null +++ b/debian/patches/mips-cxa-demangle.diff @@ -0,0 +1,21 @@ +From: Benjamin Barenblat <bbaren@google.com> +Subject: Allow __cxa_demangle on MIPS +Origin: backport, https://github.com/abseil/abseil-cpp/commit/519ef3b3f1927972bce669d775abb9b512dd590d + +Both libstdc++ and libc++abi currently ship a __cxa_demangle on MIPS; +there’s no reason to avoid using it. + +--- a/absl/base/config.h ++++ b/absl/base/config.h +@@ -902,9 +902,8 @@ + #error ABSL_INTERNAL_HAS_CXA_DEMANGLE cannot be directly set + #elif defined(OS_ANDROID) && (defined(__i386__) || defined(__x86_64__)) + #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 0 +-#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && \ +- (__GNUC__ >= 4 || (__GNUC__ >= 3 && __GNUC_MINOR__ >= 4)) && \ +- !defined(__mips__) ++#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && \ ++ (__GNUC__ >= 4 || (__GNUC__ >= 3 && __GNUC_MINOR__ >= 4)) + #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 1 + #elif defined(__clang__) && !defined(_MSC_VER) + #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 1 diff --git a/debian/patches/series b/debian/patches/series index ad7c41cc..b7caff14 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ pkg-config-directives.diff riscv-nan-formatting.diff riscv-rdcycle.diff overload-test-dependencies.diff +mips-cxa-demangle.diff |