Skip to content

Commit

Permalink
deps: cherry-pick win/arm64/clang fixes
Browse files Browse the repository at this point in the history
Refs: ngtcp2/nghttp3#112
Refs: ngtcp2/ngtcp2#692
Refs: HdrHistogram/HdrHistogram_c#114
PR-URL: #47011
Refs: ngtcp2/nghttp3#112
Refs: ngtcp2/ngtcp2#692
Refs: HdrHistogram/HdrHistogram_c#114
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
  • Loading branch information
zcbenz authored and danielleadams committed Jul 6, 2023
1 parent 873606b commit be34777
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion deps/histogram/src/hdr_atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define HDR_ATOMIC_H__


#if defined(_MSC_VER)
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))

#include <stdint.h>
#include <intrin.h>
Expand Down
4 changes: 2 additions & 2 deletions deps/histogram/src/hdr_histogram.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int64_t power(int64_t base, int64_t exp)
return result;
}

#if defined(_MSC_VER)
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))
# if defined(_WIN64)
# pragma intrinsic(_BitScanReverse64)
# else
Expand All @@ -137,7 +137,7 @@ static int64_t power(int64_t base, int64_t exp)

static int32_t count_leading_zeros_64(int64_t value)
{
#if defined(_MSC_VER)
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))
uint32_t leading_zero = 0;
#if defined(_WIN64)
_BitScanReverse64(&leading_zero, value);
Expand Down
2 changes: 1 addition & 1 deletion deps/ngtcp2/nghttp3/lib/nghttp3_ringbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "nghttp3_macro.h"

#if defined(_MSC_VER) && defined(_M_ARM64)
#if defined(_MSC_VER) && !defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64))
unsigned int __popcnt(unsigned int x) {
unsigned int c = 0;
for (; x; ++c) {
Expand Down
2 changes: 1 addition & 1 deletion deps/ngtcp2/ngtcp2/lib/ngtcp2_ringbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "ngtcp2_macro.h"

#if defined(_MSC_VER) && defined(_M_ARM64)
#if defined(_MSC_VER) && !defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64))
unsigned int __popcnt(unsigned int x) {
unsigned int c = 0;
for (; x; ++c) {
Expand Down

0 comments on commit be34777

Please sign in to comment.