fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

ARM: Fix 64 bit unaligned access in MurmurHash64A().

Browse Source
This commit is contained in:
Salvatore Sanfilippo 2017-02-19 14:01:58 +00:00
parent f917e0da4c
commit 1e272a6b52
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.h
View File

@ -206,4 +206,10 @@ void setproctitle(const char *fmt, ...);
#endif #endif
#endif #endif
/* Make sure we can test for ARM just checking for __arm__, since sometimes
* __arm is defined but __arm__ is not. */
#if defined(__arm) && !defined(__arm__)
#define __arm__
#endif
#endif #endif

4
src/hyperloglog.c
View File

@ -401,7 +401,11 @@ uint64_t MurmurHash64A (const void * key, int len, unsigned int seed) {
uint64_t k; uint64_t k;
#if (BYTE_ORDER == LITTLE_ENDIAN) #if (BYTE_ORDER == LITTLE_ENDIAN)
#ifdef __arm__
memcpy(&k,data,sizeof(uint64_t));
#else
k = *((uint64_t*)data); k = *((uint64_t*)data);
#endif
#else #else
k = (uint64_t) data[0]; k = (uint64_t) data[0];
k |= (uint64_t) data[1] << 8; k |= (uint64_t) data[1] << 8;