This is an archive of the discontinued LLVM Phabricator instance.

Differential D34599

[builtins] Flag __builtin_cl* functions as `static`
Needs ReviewPublic

Authored by alexcrichton on Jun 24 2017, 12:00 PM.

Details

Reviewers
majnemer
whitequark
Summary

Without these then all of these functions show up in all object files which include int_lib.h on Windows. This'll help prevent duplicate symbols by ensuring they're not exported.

Diff Detail

Revision Contents

PathSize
lib/
builtins/
8 lines

Diff 103858

lib/builtins/int_lib.h

Show First 20 Lines • Show All 87 Lines • ▼ Show 20 Lines
COMPILER_RT_ABI si_int __clzti2(ti_int a); COMPILER_RT_ABI si_int __clzti2(ti_int a);
COMPILER_RT_ABI tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem); COMPILER_RT_ABI tu_int __udivmodti4(tu_int a, tu_int b, tu_int* rem);
#endif #endif
/* Definitions for builtins unavailable on MSVC */ /* Definitions for builtins unavailable on MSVC */
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#include <intrin.h> #include <intrin.h>
uint32_t __inline __builtin_ctz(uint32_t value) { static uint32_t __inline __builtin_ctz(uint32_t value) {
unsigned long trailing_zero = 0; unsigned long trailing_zero = 0;
if (_BitScanForward(&trailing_zero, value)) if (_BitScanForward(&trailing_zero, value))
return trailing_zero; return trailing_zero;
return 32; return 32;
} }
uint32_t __inline __builtin_clz(uint32_t value) { static uint32_t __inline __builtin_clz(uint32_t value) {
unsigned long leading_zero = 0; unsigned long leading_zero = 0;
if (_BitScanReverse(&leading_zero, value)) if (_BitScanReverse(&leading_zero, value))
return 31 - leading_zero; return 31 - leading_zero;
return 32; return 32;
} }
#if defined(_M_ARM) || defined(_M_X64) #if defined(_M_ARM) || defined(_M_X64)
uint32_t __inline __builtin_clzll(uint64_t value) { static uint32_t __inline __builtin_clzll(uint64_t value) {
unsigned long leading_zero = 0; unsigned long leading_zero = 0;
if (_BitScanReverse64(&leading_zero, value)) if (_BitScanReverse64(&leading_zero, value))
return 63 - leading_zero; return 63 - leading_zero;
return 64; return 64;
} }
#else #else
uint32_t __inline __builtin_clzll(uint64_t value) { static uint32_t __inline __builtin_clzll(uint64_t value) {
if (value == 0) if (value == 0)
return 64; return 64;
uint32_t msh = (uint32_t)(value >> 32); uint32_t msh = (uint32_t)(value >> 32);
uint32_t lsh = (uint32_t)(value & 0xFFFFFFFF); uint32_t lsh = (uint32_t)(value & 0xFFFFFFFF);
if (msh != 0) if (msh != 0)
return __builtin_clz(msh); return __builtin_clz(msh);
return 32 + __builtin_clz(lsh); return 32 + __builtin_clz(lsh);
} }
#endif #endif
#define __builtin_clzl __builtin_clzll #define __builtin_clzl __builtin_clzll
#endif /* defined(_MSC_VER) && !defined(__clang__) */ #endif /* defined(_MSC_VER) && !defined(__clang__) */
#endif /* INT_LIB_H */ #endif /* INT_LIB_H */