non-x86 build fix for libfsimage
PATCH 1/1 non-x86 build fix for libfsimage
IA64 & PPC aren't making use of this right now, but it's silly to have
the build fail for some trivial x86 specific assembly. I snagged the appropriate bitops for ia64 and ppc (untested) and tossed in an unoptimized option as well in case we want to make use of it. Thanks,
Alex
Signed-off-by Alex Williamson <[email protected]>
---
tools/libfsimage/ext2fs/fsys_ext2fs.c +61 -0
@@ -232,6 +232,7 @@ struct ext2_dir_entry#define S_ISREG (m) (((m) & S_IFMT) == S_IFREG)#define S_ISDIR (m) (((m) & S_IFMT) == S_IFDIR) +#if defined(__i386__) || defined(__x86_64__)/* include/asm-i386/bitops.h */ /* * ffz = Find First Zero in word. Undefined if no zero exists,
@@ -250,6 +251,66 @@ ffz (unsigned long word) : "r" (~word));return word; } + +#elif defined(__ia64__) + +typedef unsigned long __u64 ; + +#if __GNUC__ >=4 || (__GNUC__ ==3 && __GNUC_MINOR__ >=4 ) +# define ia64_popcnt (x) __builtin_popcountl(x) +#else +# define ia64_popcnt (x) \ + ({ \ + __u64 ia64_intri_res; \ + asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \ + ia64_intri_res; \ + }) +#endif + +static __inline__unsigned long +ffz (unsigned long word) +{ +unsigned long result; + + result =ia64_popcnt (word & (~word -1 )); +return result; +} + +#elif defined(__powerpc__) + +static __inline__int +__ilog2 (unsigned long x) +{ +int lz; + + asm (PPC_CNTLZL "%0,%1" :"=r" (lz) :"r" (x)); +return BITS_PER_LONG -1 - lz; +} + +static __inline__unsigned long +ffz (unsigned long word) +{ +if ((word = ~word) ==0 ) +return BITS_PER_LONG ; +return __ilog2 (word & -word); +} + +#else /* Unoptimized */ + +static __inline__unsigned long +ffz (unsigned long word) +{ +unsigned long result; + + result =0 ; +while (word &1 ) + { + result++; + word >>=1 ; + } +return result; +} +#endif /* check filesystem types and read superblock into memory buffer */ int
tools/libfsimage/reiserfs/fsys_reiserfs.c +57 -0
69 lines not on this page · raw message