[Ocfs-tools-commits]
manish commits r69 - in trunk/ocfs: bugfix debugocfs format fsck
libocfs
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 16 20:01:37 CDT 2004
Author: manish
Date: 2004-06-16 19:01:35 -0500 (Wed, 16 Jun 2004)
New Revision: 69
Added:
trunk/ocfs/libocfs/bitmap.S
Modified:
trunk/ocfs/bugfix/Makefile
trunk/ocfs/debugocfs/Makefile
trunk/ocfs/format/Makefile
trunk/ocfs/fsck/Makefile
trunk/ocfs/libocfs/Makefile
trunk/ocfs/libocfs/libocfs.h
Log:
s390x build support
Modified: trunk/ocfs/bugfix/Makefile
===================================================================
--- trunk/ocfs/bugfix/Makefile 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/bugfix/Makefile 2004-06-17 00:01:35 UTC (rev 69)
@@ -32,6 +32,9 @@
ifeq ($(OCFS_PROCESSOR),i586)
DEFINES += -D__ILP32__
endif
+ifeq ($(OCFS_PROCESSOR),s390x)
+ DEFINES += -D__LP64__
+endif
CFLAGS += $(OPTIMIZE)
Modified: trunk/ocfs/debugocfs/Makefile
===================================================================
--- trunk/ocfs/debugocfs/Makefile 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/debugocfs/Makefile 2004-06-17 00:01:35 UTC (rev 69)
@@ -31,6 +31,9 @@
ifeq ($(OCFS_PROCESSOR),i686)
DEFINES += -D__ILP32__
endif
+ifeq ($(OCFS_PROCESSOR),s390x)
+ DEFINES += -D__LP64__
+endif
CFLAGS += $(OPTIMIZE)
Modified: trunk/ocfs/format/Makefile
===================================================================
--- trunk/ocfs/format/Makefile 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/format/Makefile 2004-06-17 00:01:35 UTC (rev 69)
@@ -26,6 +26,9 @@
ifeq ($(OCFS_PROCESSOR),i686)
DEFINES += -D__ILP32__
endif
+ifeq ($(OCFS_PROCESSOR),s390x)
+ DEFINES += -D__LP64__
+endif
CFLAGS += $(OPTIMIZE)
Modified: trunk/ocfs/fsck/Makefile
===================================================================
--- trunk/ocfs/fsck/Makefile 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/fsck/Makefile 2004-06-17 00:01:35 UTC (rev 69)
@@ -32,6 +32,9 @@
ifeq ($(OCFS_PROCESSOR),i686)
DEFINES += -D__ILP32__
endif
+ifeq ($(OCFS_PROCESSOR),s390x)
+ DEFINES += -D__LP64__
+endif
CFLAGS += $(OPTIMIZE)
Modified: trunk/ocfs/libocfs/Makefile
===================================================================
--- trunk/ocfs/libocfs/Makefile 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/libocfs/Makefile 2004-06-17 00:01:35 UTC (rev 69)
@@ -32,6 +32,9 @@
ifeq ($(OCFS_PROCESSOR),i686)
DEFINES += -D__ILP32__
endif
+ifeq ($(OCFS_PROCESSOR),s390x)
+ DEFINES += -D__LP64__
+endif
CFLAGS += $(OPTIMIZE)
@@ -98,6 +101,10 @@
OBJS = $(subst .c,.o,$(CFILES))
+ifeq ($(OCFS_PROCESSOR),s390x)
+ OBJS += bitmap.o
+endif
+
libocfs.a: $(OBJS)
rm -f $@
$(AR) r $@ $^
@@ -108,7 +115,7 @@
clean-libocfs:
rm -f Common/*.o Linux/*.o Common/*.p Linux/*.p Common/*.s Linux/*.s *.o *.p *.s
-DIST_FILES = $(CFILES) $(HFILES)
+DIST_FILES = $(CFILES) $(HFILES) bitmap.S
DIST_RULES = dist-subdircreate
Added: trunk/ocfs/libocfs/bitmap.S
===================================================================
--- trunk/ocfs/libocfs/bitmap.S 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/libocfs/bitmap.S 2004-06-17 00:01:35 UTC (rev 69)
@@ -0,0 +1,55 @@
+/*
+ * arch/s390/kernel/bitmap.S
+ * Bitmaps for set_bit, clear_bit, test_and_set_bit, ...
+ * See include/asm-s390/{bitops.h|posix_types.h} for details
+ *
+ * S390 version
+ * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Martin Schwidefsky (schwidefsky at de.ibm.com),
+ */
+
+ .globl _oi_bitmap
+_oi_bitmap:
+ .byte 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
+
+ .globl _ni_bitmap
+_ni_bitmap:
+ .byte 0xFE,0xFD,0xFB,0xF7,0xEF,0xDF,0xBF,0x7F
+
+ .globl _zb_findmap
+_zb_findmap:
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
+ .byte 0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,8
+
+ .globl _sb_findmap
+_sb_findmap:
+ .byte 8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
+ .byte 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
Modified: trunk/ocfs/libocfs/libocfs.h
===================================================================
--- trunk/ocfs/libocfs/libocfs.h 2004-06-17 00:01:09 UTC (rev 68)
+++ trunk/ocfs/libocfs/libocfs.h 2004-06-17 00:01:35 UTC (rev 69)
@@ -316,7 +316,7 @@
#endif
-#if !defined(smp_mb__before_clear_bit)
+#if !defined(test_bit)
#if defined(__powerpc__) && !defined(__powerpc64__)
@@ -423,7 +423,7 @@
}
#else /* !ppc32 */
-#error "Your platform doesn't provide the functions required in <asm/bitopts.h>"
+#error "Your platform doesn't provide the functions required in <asm/bitops.h>"
#endif
#endif /* !smp_mb__before_clear_bit */
More information about the Ocfs-tools-commits
mailing list