From: Theodore Ts'o Date: Mon, 21 Nov 2005 05:04:31 +0000 (-0500) Subject: Fix gcc compilation on sparc architectures in bitops.h X-Git-Tag: E2FSPROGS-1.39-WIP-1210~16 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=125e084cef02fe865a34181ccfa7f258ccf8ab34;p=tools%2Fe2fsprogs.git Fix gcc compilation on sparc architectures in bitops.h We no longer have the sparc assembly code in the header file any more, so we shouldn't set _EXT2_HAVE_AS_BITOPS_. This would break compiles on the sparc architectures when using gcc. Signed-off-by: "Theodore Ts'o" --- diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 40793f9..babd134 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,10 @@ +2005-11-20 Theodore Ts'o + + * bitops.h: We no longer have the sparc assembly code in the + header file any more, so we shouldn't set + _EXT2_HAVE_AS_BITOPS_. This would break compiles on the + sparc architectures when using gcc. + 2005-11-13 Theodore Ts'o * ext2fs.h: Add #include since the inline functions use diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h index dbd3027..8d7c720 100644 --- a/lib/ext2fs/bitops.h +++ b/lib/ext2fs/bitops.h @@ -111,8 +111,7 @@ extern int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap, */ #ifdef NO_INLINE_FUNCS #if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || \ - defined(__i586__) || defined(__mc68000__) || \ - defined(__sparc__))) + defined(__i586__) || defined(__mc68000__))) /* This prevents bitops.c from trying to include the C */ /* function version of these functions */ #define _EXT2_HAVE_ASM_BITOPS_