Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: cherry-pick win/arm64/clang fixes #47011

Merged
merged 1 commit into from
Mar 19, 2023
Merged

deps: cherry-pick win/arm64/clang fixes #47011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/histogram/src/hdr_atomic.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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