Commit d2e6dff
deps: brotli: cherry-pick e230f474b87
Origin commit message:
disable BROTLI_MODEL macro for some targets
PiperOrigin-RevId: 827486322
Refs: google/brotli@e230f47
PR-URL: #61003
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>1 parent 324ea4f commit d2e6dff
1 file changed
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -213,6 +213,10 @@ To apply compiler hint, enclose the branching condition into macros, like this: | |||
| 213 | 213 | #define BROTLI_TARGET_MIPS64 | |
| 214 | 214 | #endif | |
| 215 | 215 | ||
| 216 | + #if defined(__ia64__) || defined(_M_IA64) | ||
| 217 | + #define BROTLI_TARGET_IA64 | ||
| 218 | + #endif | ||
| 219 | + | ||
| 216 | 220 | #if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \ | |
| 217 | 221 | defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \ | |
| 218 | 222 | defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64) | |
@@ -665,13 +669,14 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) { | |||
| 665 | 669 | #undef BROTLI_TEST | |
| 666 | 670 | #endif | |
| 667 | 671 | ||
| 668 | - #if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) | ||
| 672 | + #if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \ | ||
| 673 | + !defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64) | ||
| 669 | 674 | #define BROTLI_MODEL(M) __attribute__((model(M))) | |
| 670 | 675 | #else | |
| 671 | 676 | #define BROTLI_MODEL(M) /* M */ | |
| 672 | 677 | #endif | |
| 673 | 678 | ||
| 674 | - #if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) | ||
| 679 | + #if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) | ||
| 675 | 680 | #define BROTLI_COLD __attribute__((cold)) | |
| 676 | 681 | #else | |
| 677 | 682 | #define BROTLI_COLD /* cold */ | |
0 commit comments