[OpenAFS-devel] Port to Linux for S/390
Neale.Ferguson@softwareAG-usa.com
Neale.Ferguson@softwareAG-usa.com
Mon, 11 Dec 2000 12:56:21 +0200
I've built 1.0.1 on Linux for S/390, the diffs are minimal and attached.
Is the source for washtool available anywhere? The build worked fine
without it but I was just curious.
===================================================================
RCS file: ./openafs-1.0.1/src/config/afs_sysnames.h,v
retrieving revision 1.1
diff -u5 -r1.1 ./openafs-1.0.1/src/config/afs_sysnames.h
--- ./openafs-1.0.1/src/config/afs_sysnames.h 2000/12/07 17:16:54 1.1
+++ ./openafs-1.0.1/src/config/afs_sysnames.h 2000/12/07 17:18:49
@@ -112,10 +112,14 @@
#define SYS_NAME_ID_ppc_linux2 1600
#define SYS_NAME_ID_ppc_linux22 1601
#define SYS_NAME_ID_ppc_linux24 1602
+#define SYS_NAME_ID_s390_linux2 1700
+#define SYS_NAME_ID_s390_linux22 1701
+#define SYS_NAME_ID_s390_linux24 1702
+
/*
* Placeholder to keep system-wide standard flags since this file is included b
y all
* files (i.e in afs/param.h)
===================================================================
RCS file: ./openafs-1.0.1/src/des/andrew-conf.h,v
retrieving revision 1.1
diff -u5 -r1.1 ./openafs-1.0.1/src/des/andrew-conf.h
--- ./openafs-1.0.1/src/des/andrew-conf.h 2000/12/07 17:20:49 1.1
+++ ./openafs-1.0.1/src/des/andrew-conf.h 2000/12/07 19:33:45
@@ -2,62 +2,66 @@
* Andrew configuration.
*/
#include <afs/param.h>
#ifdef vax
-#include "conf-bsdvax.h"
-#else
-#if mips && !defined(sgi)
-#include "conf-mips.h"
-#else
-#if defined(sun) && !defined(AFS_X86_ENV)
-#include "conf-bsd-sun.h"
-#else
-#ifdef AFS_AIX_ENV
-#include "conf-aix-ibm.h"
-#else
-#ifdef mac2
-#include "conf-bsd-mac.h"
-#else
-#ifdef AFS_HPUX_ENV
-#ifdef hp9000s300
-#include "conf-hp9000s300.h"
-#else
-#include "conf-hp9000s700.h"
-#endif
-#else
-#ifdef NeXT
-#include "conf-next.h"
-#else
-#if defined(sgi)
-#include "conf-sgi.h"
-#else
-#ifdef __alpha
-#include "conf-bsd-alpha.h"
-#else
-#if defined(AFS_X86_ENV)
-#include "conf-bsd-ncr.h"
-#else
-#ifdef AFS_NT40_ENV
-#include "conf-winnt.h"
-#else
-#ifdef AFS_LINUX20_ENV
-#ifdef AFS_PPC_LINUX20_ENV
-#include "conf-ppc-linux.h"
-#else
-#include "conf-i386-linux.h"
-#endif
+# include "conf-bsdvax.h"
#else
+# if mips && !defined(sgi)
+# include "conf-mips.h"
+# else
+# if defined(sun) && !defined(AFS_X86_ENV)
+# include "conf-bsd-sun.h"
+# else
+# ifdef AFS_AIX_ENV
+# include "conf-aix-ibm.h"
+# else
+# ifdef mac2
+# include "conf-bsd-mac.h"
+# else
+# ifdef AFS_HPUX_ENV
+# ifdef hp9000s300
+# include "conf-hp9000s300.h"
+# else
+# include "conf-hp9000s700.h"
+# endif
+# else
+# ifdef NeXT
+# include "conf-next.h"
+# else
+# if defined(sgi)
+# include "conf-sgi.h"
+# else
+# ifdef __alpha
+# include "conf-bsd-alpha.h"
+# else
+# if defined(AFS_X86_ENV)
+# include "conf-bsd-ncr.h"
+# else
+# ifdef AFS_NT40_ENV
+# include "conf-winnt.h"
+# else
+# ifdef AFS_LINUX20_ENV
+# ifdef AFS_PPC_LINUX20_ENV
+# include "conf-ppc-linux.h"
+# else
+# ifdef AFS_S390_LINUX20_ENV
+# include "conf-s390-linux.h"
+# else
+# include "conf-i386-linux.h"
+# endif
+# endif
+# else
Sorry, you lose.
Figure out what the machine looks like and fix this file to include it.
-#endif /* AFS_LINUX20_ENV */
-#endif /* AFS_NT40_ENV */
-#endif /* NCR || X86 */
-#endif /* __alpha */
-#endif /* SGI */
-#endif /* NeXT */
-#endif /* HP/UX */
-#endif /* mac */
-#endif /* aix */
-#endif /* sun */
-#endif /* mips */
+# endif /* AFS_LINUX20_ENV */
+# endif /* AFS_NT40_ENV */
+# endif /* NCR || X86 */
+# endif /* __alpha */
+# endif /* SGI */
+# endif /* NeXT */
+# endif /* HP/UX */
+# endif /* mac */
+# endif /* aix */
+# endif /* sun */
+# endif /* mips */
#endif /* not vax */
===================================================================
RCS file: ./openafs-1.0.1/src/libafs/MakefileProto.LINUX,v
retrieving revision 1.1
diff -u5 -r1.1 ./openafs-1.0.1/src/libafs/MakefileProto.LINUX
--- ./openafs-1.0.1/src/libafs/MakefileProto.LINUX 2000/12/07 21:41:02 1.1
+++ ./openafs-1.0.1/src/libafs/MakefileProto.LINUX 2000/12/07 23:01:02
@@ -44,10 +44,16 @@
<ppc_linux22 ppc_linux24>
CCFLAGS = -O2 -fomit-frame-pointer -fno-strength-reduce \
-fno-strict-aliasing -fsigned-char -msoft-float -pipe \
-fno-builtin -ffixed-r2
DEFINES = -D__KERNEL__ -D__powerpc__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
+<s390_linux22 s390_linux24>
+CCFLAGS = -O2 -fomit-frame-pointer -fno-strength-reduce \
+ -fno-strict-aliasing -fsigned-char -pipe \
+ -fno-builtin
+# -specs=/opt/SoftwareAG/glibc-2.2pre/etc/specs
+DEFINES = -D__KERNEL__ -D__s390__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
<all>
INCLUDES = -I. -I../
CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
===================================================================
RCS file: ./openafs-1.0.1/src/venus/kdump.c,v
retrieving revision 1.1
diff -u5 -r1.1 ./openafs-1.0.1/src/venus/kdump.c
--- ./openafs-1.0.1/src/venus/kdump.c 2000/12/07 23:35:24 1.1
+++ ./openafs-1.0.1/src/venus/kdump.c 2000/12/07 23:46:10
@@ -208,19 +208,27 @@
#undef UINT_MAX
#undef LONG_MAX
#undef ULONG_MAX
#define _LINUX_TIME_H
#define _LINUX_FCNTL_H
+#ifndef AFS_S390_LINUX20_ENV
#define _I386_STATFS_H
+#else
+#define _S390_STATFS_H
+#endif
struct timezone {
int a,b;
};
typedef struct timeval {
int tv_sec;
int tv_usec;
} timeval_t; /* Needed here since KERNEL defined. */
+#ifndef AFS_S390_LINUX20_ENV
#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H
+#else
+#define _LINUX_BYTEORDER_BIG_ENDIAN_H
+#endif
#include <linux/version.h>
#include <linux/fs.h>
#include <afs/osi_vfs.h>
#else /* AFS_LINUX20_ENV */
#ifdef AFS_HPUX110_ENV
--- /dev/null Wed Nov 29 19:46:43 2000
+++ ./openafs-1.0.1/src/config/Makefile.s390_linux22 Thu Dec 7 23:11:27 2000
@@ -0,0 +1,52 @@
+# Copyright 1998 Transarc Corporation
+#
+# Keep macros within each section in sorted order for clean diff displays.
+#
+# AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
+AFS_OSTYPE = LINUX
+
+# Base directory for linux kernel source. Actually a prefix which is complete
+# when LINUX_VERS is appended to it.
+LINUX_SRCDIR = /usr/src/linux-
+# Default list of Linux kernels to build. Build will run only if all
+# can be built. To build a different set, specify LINUX_VERS to make.
+LINUX_VERS = 2.2.16
+
+#
+# compilation and link editor flags
+DBG=-g
+OPTMZ=-O2
+PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
+# Put -O2 here to _ensure_ all Makefiles pick it up.
+XCFLAGS= -O2 -specs=/opt/SoftwareAG/glibc-2.2pre/etc/specs
+XCFLAGS= -O2
+MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
+XLDFLAGS=-specs=/opt/SoftwareAG/glibc-2.2pre/etc/specs
+XLDFLAGS=
+SHARE_LDFLAGS = -shared -Xlinker -x
+SHLIB_SUFFIX=so
+SHLIB_CFLAGS=
+#
+# libraries
+MTLIBS=-lpthread
+TXLIBS= /usr/lib/libncurses.so
+XLIBS=
+#
+# programs
+AR=ar
+AS=as
+CP=cp
+INSTALL=${SRCDIR}bin/install
+LD=gcc
+MT_CC=gcc
+MV=mv
+RANLIB=ranlib
+RM=rm
+WASHTOOL=${SRCDIR}bin/washtool
+#
+# Other OS specific requirements
+#
+YACC = bison -y
+LEX = flex -l
+# Used in des library.
+CRYPT_OBJ = crypt.o
--- /dev/null Wed Nov 29 19:46:43 2000
+++ ./openafs-1.0.1/src/config/param.s390_linux22.h Thu Dec 7 22:13:19 2000
@@ -0,0 +1,67 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef _PARAM_S390_LINUX22_H_
+#define _PARAM_S390_LINUX22_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously s390 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define AFS_LINUX20_ENV 1
+#define AFS_LINUX22_ENV 1
+#define AFS_S390_LINUX20_ENV 1
+#define AFS_S390_LINUX22_ENV 1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV 1
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME "s390_linux22"
+#define SYS_NAME_ID SYS_NAME_ID_s390_linux22
+#define AFSBIG_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+#if defined(__KERNEL__) && !defined(KDUMP_KERNEL)
+#include <linux/config.h>
+#ifdef CONFIG_SMP
+#undef CONFIG_SMP
+#endif
+/* Using "AFS_SMP" to map to however many #define's are required to get
+ * MP to compile for Linux
+ */
+#ifdef AFS_SMP
+#define CONFIG_SMP
+#ifndef CONFIG_S390_LOCAL_APIC
+#define CONFIG_S390_LOCAL_APIC
+#endif
+#define __SMP__
+#define AFS_GLOBAL_SUNLOCK
+#endif
+
+#endif /* __KERNEL__ && !DUMP_KERNEL*/
+
+#ifdef KERNEL
+#ifndef MIN
+#define MIN(A,B) ((A) < (B) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) ((A) > (B) ? (A) : (B))
+#endif
+#endif /* KERNEL */
+
+#endif /* _PARAM_S390_LINUX20_H_ */
--- /dev/null Wed Nov 29 19:46:43 2000
+++ ./openafs-1.0.1/src/config/param.s390_linux22_usr.h Thu Dec 7 22:13:56 2000
@@ -0,0 +1,56 @@
+/* Copyright (C) 1998 by Transarc Corporation */
+
+
+#ifndef _PARAM_USR_S390_LINUX22_H_
+#define _PARAM_USR_S390_LINUX22_H_
+
+/* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel,
+ * it's a judgment call. If something is obviously s390 specific, use that
+ * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2"
+ * in the sysname is the current version of the client. This takes into
+ * account the perferred OS user space configuration as well as the kernel.
+ */
+
+#define UKERNEL 1 /* user space kernel */
+#define AFS_ENV 1
+#define AFS_USR_LINUX20_ENV 1
+#define AFS_USR_LINUX22_ENV 1
+#define AFS_NONFSTRANS 1
+
+#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */
+#define AFS_SYSCALL 137
+#define AFS_64BIT_IOPS_ENV 1
+#define AFS_NAMEI_ENV 1 /* User space interface to file system */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV 1
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+
+
+/* Machine / Operating system information */
+#define SYS_NAME "s390_linux22"
+#define SYS_NAME_ID SYS_NAME_ID_s390_linux22
+#define AFSBIG_ENDIAN 1
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+#define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */
+
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_fmode uio_fmode
+#define afsio_resid uio_resid
+#define AFS_UIOSYS 1
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES MCLBYTES
+#define AFS_MINCHANGE 2
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#endif /* _PARAM_USR_S390_LINUX22_H_ */
--- /dev/null Wed Nov 29 19:46:43 2000
+++ ./openafs-1.0.1/src/des/conf-s390-linux.h Thu Dec 7 18:14:02 2000
@@ -0,0 +1,15 @@
+/*
+ * Copyright 1988 by the Massachusetts Institute of Technology.
+ *
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
+ *
+ * Machine-type definitions: Linux on Intel
+ */
+
+#include <mit-cpyright.h>
+
+#define BITS32
+#define BIG
+#define MSBFIRST
+#define MUSTALIGN