| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame] | 1 | From ed549d43c8b691cd7891c7e5c76df189feb04b4f Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Sun, 7 Apr 2024 17:16:53 +0800 |
| 4 | Subject: [PATCH] Fix declaration scope of LE_LOAD32 in crc32c |
| 5 | |
| 6 | Fix build error when __SSE4_2__ is defined: |
| 7 | util/crc32c.cc: In function 'void rocksdb::crc32c::DefaultCRC32(uint64_t*, const uint8_t**)': |
| 8 | util/crc32c.cc:267:53: error: 'LE_LOAD32' was not declared in this scope |
| 9 | 267 | *l = _mm_crc32_u32(static_cast<unsigned int>(*l), LE_LOAD32(*p)); |
| 10 | | ^~~~~~~~~ |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12515] |
| 13 | |
| 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 15 | --- |
| 16 | util/crc32c.cc | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/util/crc32c.cc b/util/crc32c.cc |
| 20 | index 38a69bb50..aa13ad882 100644 |
| 21 | --- a/util/crc32c.cc |
| 22 | +++ b/util/crc32c.cc |
| 23 | @@ -242,12 +242,12 @@ static const uint32_t table3_[256] = { |
| 24 | 0xc747336e, 0x1a0299d6, 0x782010ef, 0xa565ba57, 0xbc65029d, 0x6120a825, |
| 25 | 0x0302211c, 0xde478ba4, 0x31035088, 0xec46fa30, 0x8e647309, 0x5321d9b1, |
| 26 | 0x4a21617b, 0x9764cbc3, 0xf54642fa, 0x2803e842}; |
| 27 | +#endif // !__SSE4_2__ |
| 28 | |
| 29 | // Used to fetch a naturally-aligned 32-bit word in little endian byte-order |
| 30 | static inline uint32_t LE_LOAD32(const uint8_t* p) { |
| 31 | return DecodeFixed32(reinterpret_cast<const char*>(p)); |
| 32 | } |
| 33 | -#endif // !__SSE4_2__ |
| 34 | |
| 35 | static inline void DefaultCRC32(uint64_t* l, uint8_t const** p) { |
| 36 | #ifndef __SSE4_2__ |
| 37 | -- |
| 38 | 2.25.1 |
| 39 | |