ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12699 from hugueskamba/hk_remove_armc5_support_storage 

Storage: Remove support for ARM Compiler 5
pull/12825/head
Martin Kojtal 2020-04-15 15:30:44 +02:00 committed by GitHub
parent 447cfbc9a0 a9a00e9b29
commit ee476d9954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/storage/filesystem/littlefs/littlefs/lfs_util.h
View File

@ -116,7 +116,7 @@ static inline uint32_t lfs_min(uint32_t a, uint32_t b) {
// Find the next smallest power of 2 less than or equal to a
static inline uint32_t lfs_npw2(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && MBED_LFS_INTRINSICS && \
(defined(__GNUC__) || defined(__CC_ARM))
defined(__GNUC__)
return 32 - __builtin_clz(a-1);
#else
uint32_t r = 0;
@ -144,7 +144,7 @@ static inline uint32_t lfs_ctz(uint32_t a) {
// Count the number of binary ones in a
static inline uint32_t lfs_popc(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && MBED_LFS_INTRINSICS && \
(defined(__GNUC__) || defined(__CC_ARM))
defined(__GNUC__)
return __builtin_popcount(a);
#else
a = a - ((a >> 1) & 0x55555555);