aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-11-21 00:04:31 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-11-21 00:04:31 -0500
commit125e084cef02fe865a34181ccfa7f258ccf8ab34 (patch)
tree902d396fb8e2f9d3254f59dacb8104f374c625e1
parenta82a57025c4368de330ecac9a430d84137ae2268 (diff)
downloade2fsprogs-125e084cef02fe865a34181ccfa7f258ccf8ab34.tar.gz
e2fsprogs-125e084cef02fe865a34181ccfa7f258ccf8ab34.tar.xz
e2fsprogs-125e084cef02fe865a34181ccfa7f258ccf8ab34.zip
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" <tytso@mit.edu>
-rw-r--r--lib/ext2fs/ChangeLog7
-rw-r--r--lib/ext2fs/bitops.h3
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 40793f9d..babd1349 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-20 Theodore Ts'o <tytso@mit.edu>
+
+ * 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 <tytso@mit.edu>
* ext2fs.h: Add #include <string.h> since the inline functions use
diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
index dbd30270..8d7c7206 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_