mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'jk/drop-unaligned-loads'
Compilation fix around type punning. * jk/drop-unaligned-loads: Revert "fast-export: use local array to store anonymized oid" bswap.h: drop unaligned loads
This commit is contained in:
commit
86cca370e1
1
Makefile
1
Makefile
|
@ -1232,7 +1232,6 @@ SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))
|
|||
BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
|
||||
BASIC_CFLAGS += -fno-omit-frame-pointer
|
||||
ifneq ($(filter undefined,$(SANITIZERS)),)
|
||||
BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
|
||||
BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
|
||||
endif
|
||||
ifneq ($(filter leak,$(SANITIZERS)),)
|
||||
|
|
|
@ -405,12 +405,12 @@ static char *generate_fake_oid(void *data)
|
|||
{
|
||||
static uint32_t counter = 1; /* avoid null oid */
|
||||
const unsigned hashsz = the_hash_algo->rawsz;
|
||||
unsigned char out[GIT_MAX_RAWSZ];
|
||||
struct object_id oid;
|
||||
char *hex = xmallocz(GIT_MAX_HEXSZ);
|
||||
|
||||
hashclr(out);
|
||||
put_be32(out + hashsz - 4, counter++);
|
||||
return hash_to_hex_algop_r(hex, out, the_hash_algo);
|
||||
oidclr(&oid);
|
||||
put_be32(oid.hash + hashsz - 4, counter++);
|
||||
return oid_to_hex_r(hex, &oid);
|
||||
}
|
||||
|
||||
static const char *anonymize_oid(const char *oid_hex)
|
||||
|
|
|
@ -145,28 +145,6 @@ static inline uint64_t git_bswap64(uint64_t x)
|
|||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Performance might be improved if the CPU architecture is OK with
|
||||
* unaligned 32-bit loads and a fast ntohl() is available.
|
||||
* Otherwise fall back to byte loads and shifts which is portable,
|
||||
* and is faster on architectures with memory alignment issues.
|
||||
*/
|
||||
|
||||
#if !defined(NO_UNALIGNED_LOADS) && ( \
|
||||
defined(__i386__) || defined(__x86_64__) || \
|
||||
defined(_M_IX86) || defined(_M_X64) || \
|
||||
defined(__ppc__) || defined(__ppc64__) || \
|
||||
defined(__powerpc__) || defined(__powerpc64__) || \
|
||||
defined(__s390__) || defined(__s390x__))
|
||||
|
||||
#define get_be16(p) ntohs(*(unsigned short *)(p))
|
||||
#define get_be32(p) ntohl(*(unsigned int *)(p))
|
||||
#define get_be64(p) ntohll(*(uint64_t *)(p))
|
||||
#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0)
|
||||
#define put_be64(p, v) do { *(uint64_t *)(p) = htonll(v); } while (0)
|
||||
|
||||
#else
|
||||
|
||||
static inline uint16_t get_be16(const void *ptr)
|
||||
{
|
||||
const unsigned char *p = ptr;
|
||||
|
@ -212,6 +190,4 @@ static inline void put_be64(void *ptr, uint64_t value)
|
|||
p[7] = value >> 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* COMPAT_BSWAP_H */
|
||||
|
|
Loading…
Reference in a new issue