shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

libdm: use libdm header util.h

Browse Source 
Avoid using lvm header for libdm build.
This commit is contained in:
Zdenek Kabelac 2021-03-29 22:43:36 +02:00
parent f1e8437c59
commit 648188df2a
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libdm/dm-tools/util.h
View File

@ -76,4 +76,45 @@
#define FMTVGID "%." DM_TO_STRING(ID_LEN) "s" #define FMTVGID "%." DM_TO_STRING(ID_LEN) "s"
/*
* GCC 3.4 adds a __builtin_clz, which uses the count leading zeros (clz)
* instruction on arches that have one. Provide a fallback using shifts
* and comparisons for older compilers.
*/
#ifdef HAVE___BUILTIN_CLZ
#define clz(x) __builtin_clz((x))
#else /* ifdef HAVE___BUILTIN_CLZ */
static unsigned _dm_clz(unsigned x)
{
int n;
if ((int)x <= 0) return (~x >> 26) & 32;
n = 1;
if ((x >> 16) == 0) {
n = n + 16;
x = x << 16;
}
if ((x >> 24) == 0) {
n = n + 8;
x = x << 8;
}
if ((x >> 28) == 0) {
n = n + 4;
x = x << 4;
}
if ((x >> 30) == 0) {
n = n + 2;
x = x << 2;
}
n = n - (x >> 31);
return n;
}
#define clz(x) _dm_clz((x))
#endif /* ifdef HAVE___BUILTIN_CLZ */
#endif #endif

2
libdm/misc/dmlib.h
View File

@ -72,7 +72,7 @@
#define DM_EXPORT_SYMBOL_BASE(func) #define DM_EXPORT_SYMBOL_BASE(func)
#endif #endif
#include "lib/misc/util.h" #include "libdm/dm-tools/util.h"
#include "libdm/libdevmapper.h" #include "libdm/libdevmapper.h"
#include "libdm/misc/dm-logging.h" #include "libdm/misc/dm-logging.h"