diff options
| author | Haibo Huang <hhb@google.com> | 2020-12-10 21:23:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 21:23:14 +0000 |
| commit | dbee2544ffcf2164ac3e574690702f5adbd8921d (patch) | |
| tree | 3d92e5b435611f66779c77cdf8e1dd3b50769081 | |
| parent | 2634cccb352ba49ca34473b735c8314e315adb60 (diff) | |
| parent | 4a39f58be5985e2ebb30f50d0f273b92573281a3 (diff) | |
| download | FXdiv-dbee2544ffcf2164ac3e574690702f5adbd8921d.tar.gz | |
Upgrade FXdiv to 63058eff77e11aa15bf531df5dd34395ec3017c8 am: 13d63439bf am: aa4eb53631 am: 4a39f58be5
Original change: https://android-review.googlesource.com/c/platform/external/FXdiv/+/1522384
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie70e84ac97176dc6e31fba0f92fde324394d9b12
| -rw-r--r-- | BUILD.bazel | 2 | ||||
| -rw-r--r-- | METADATA | 6 | ||||
| -rw-r--r-- | include/fxdiv.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 7b0ba72..2e3882b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,6 +2,8 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") licenses(["notice"]) +exports_files(["LICENSE"]) + ################################# FXdiv library ################################ cc_library( @@ -9,11 +9,11 @@ third_party { type: GIT value: "https://github.com/Maratyszcza/FXdiv" } - version: "561254d968e5679460e6a0a743206410284d9f46" + version: "63058eff77e11aa15bf531df5dd34395ec3017c8" license_type: NOTICE last_upgrade_date { year: 2020 - month: 4 - day: 13 + month: 12 + day: 9 } } diff --git a/include/fxdiv.h b/include/fxdiv.h index f5a09d0..2c35038 100644 --- a/include/fxdiv.h +++ b/include/fxdiv.h @@ -173,7 +173,7 @@ static inline struct fxdiv_divisor_uint32_t fxdiv_init_uint32_t(uint32_t d) { : "=a" (q), "+d" (u_hi) : [d] "r" (d), "a" (0) : "cc"); - #elif (defined(_MSC_VER) && _MSC_VER >= 1920) && (defined(_M_IX86) || defined(_M_X64)) + #elif (defined(_MSC_VER) && _MSC_VER >= 1920) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (defined(_M_IX86) || defined(_M_X64)) unsigned int remainder; const uint32_t q = (uint32_t) _udiv64((unsigned __int64) ((uint64_t) u_hi << 32), (unsigned int) d, &remainder); #else @@ -274,7 +274,7 @@ static inline struct fxdiv_divisor_uint64_t fxdiv_init_uint64_t(uint64_t d) { #elif 0 && defined(__GNUC__) && defined(__SIZEOF_INT128__) /* GCC, Clang, and Intel Compiler fail to inline optimized implementation and call into support library for 128-bit division */ const uint64_t q = (uint64_t) (((unsigned __int128) u_hi << 64) / ((unsigned __int128) d)); - #elif (defined(_MSC_VER) && _MSC_VER >= 1920) && defined(_M_X64) + #elif (defined(_MSC_VER) && _MSC_VER >= 1920) && !defined(__clang__) && !defined(__INTEL_COMPILER) && defined(_M_X64) unsigned __int64 remainder; const uint64_t q = (uint64_t) _udiv128((unsigned __int64) u_hi, 0, (unsigned __int64) d, &remainder); #else |