Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From 9130b9667206275a9030d64d6da2672dc2d3b089 Mon Sep 17 00:00:00 2001
From: Evgenii Kliuchnikov <[email protected]>
Date: Wed, 29 Oct 2025 02:01:53 -0700
Subject: [PATCH] FROMLIST: disable BROTLI_MODEL macro for some targets

PiperOrigin-RevId: 825438559

Link: https://github.com/google/brotli/pull/1369
Signed-off-by: Mingcong Bai <[email protected]>
---
c/common/platform.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/c/common/platform.h b/c/common/platform.h
index b59f9b8..e1254d5 100644
--- a/c/common/platform.h
+++ b/c/common/platform.h
@@ -213,6 +213,10 @@ OR:
#define BROTLI_TARGET_MIPS64
#endif

+#if defined(__ia64__) || defined(_M_IA64)
+#define BROTLI_TARGET_IA64
+#endif
+
#if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \
defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \
defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64)
@@ -665,13 +669,14 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) {
#undef BROTLI_TEST
#endif

-#if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3)
+#if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \
+ !defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64)
#define BROTLI_MODEL(M) __attribute__((model(M)))
#else
#define BROTLI_MODEL(M) /* M */
#endif

-#if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
+#if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
#define BROTLI_COLD __attribute__((cold))
#else
#define BROTLI_COLD /* cold */
--
2.51.1

2 changes: 1 addition & 1 deletion app-utils/brotli/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VER=1.1.0
VER=1.2.0
SRCS="git::commit=tags/v$VER::https://github.com/google/brotli"
CHKSUMS="SKIP"
CHKUPDATE="anitya::id=15235"