Merge pull request swiftlang#2621 from 3405691582/Prefix_ExposeIntrinsics

[CF] Expose flsl and narrow scope of popcountll.

Author: compnerd

CoreFoundation/Base.subproj/CoreFoundation_Prefix.h

@@ -227,6 +227,15 @@ CF_INLINE uint64_t mach_absolute_time() {
 #define strtol_l(a,b,c,locale) strtol(a,b,c)
 
 #define fprintf_l(a,locale,b,...) fprintf(a, b, __VA_ARGS__)
+
+CF_INLINE int flsl( long mask ) {
+    int idx = 0;
+    while (mask != 0) {
+        mask = (unsigned long)mask >> 1;
+        idx++;
+    }
+    return idx;
+}
 #endif // TARGET_OS_LINUX || TARGET_OS_WIN32 || defined(__OpenBSD__)
 
 #if TARGET_OS_LINUX
@@ -369,6 +378,15 @@ CF_INLINE long long llabs(long long v) {
 #include <fcntl.h>
 #include <errno.h>
 
+CF_INLINE int popcountll(long long x) {
+    int count = 0;
+    while (x) {
+        count++;
+        x &= x - 1; // reset LS1B
+    }
+    return count;
+}
+
 #endif
 
 #if !defined(CF_PRIVATE)
@@ -384,21 +402,6 @@ CF_INLINE long long llabs(long long v) {
 
 #include <stdarg.h>
 
-CF_INLINE int flsl( long mask ) {
-    int idx = 0;
-    while (mask != 0) mask = (unsigned long)mask >> 1, idx++;
-    return idx;
-}
-    
-CF_INLINE int popcountll(long long x) {
-    int count = 0;
-    while (x) {
-        count++;
-        x &= x - 1; // reset LS1B
-    }
-    return count;
-}
-
 CF_PRIVATE int asprintf(char **ret, const char *format, ...);
 
 #endif