From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Tue, 23 Apr 2002 04:22:29 +0000 (+0000)
Subject: STABLE12-linux-ia64-updates-20020422
X-Git-Tag: openafs-stable-1_2_4~26
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=597adff7ddc576c39b71594b0ac760f125e664a3;p=packages%2Fo%2Fopenafs.git

STABLE12-linux-ia64-updates-20020422


updates to make it work with later 2.4

SYSCALL2POINTER change may be unnecessary (sparc64 way should work)
but without any way to test...


(cherry picked from commit e12859bed90a0bd896150b7cfc137d0ef52e48c3)
---

diff --git a/Makefile.in b/Makefile.in
index 3955ed004..02e5c4c36 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,7 @@ login: project kauth rxkad
 		${COMPILE_PART1} sia ${COMPILE_PART2} ;; \
 	sun4x_55 ) \
 		${COMPILE_PART1} login ${COMPILE_PART2} ;; \
-	parisc_linux24) \
+	parisc_linux24|ia64_linux24) \
 		echo Skipping pam/login for parisc_linux24 ;; \
 	sun4x_* | hp_ux11* | *linux* | *fbsd* ) \
 		${COMPILE_PART1} pam ${COMPILE_PART2} ;; \
diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index bf7c9bb85..fecb72c74 100644
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -154,8 +154,12 @@ asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist);
 #define SYSCALL2POINTER (void *)(long)
 #else
 #define POINTER2SYSCALL (void *)
+#ifdef AFS_IA64_LINUX20_ENV
+#define SYSCALL2POINTER (long)
+#else
 #define SYSCALL2POINTER (void *)
 #endif
+#endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 int __init afs_init(void)
diff --git a/src/config/Makefile.ia64_linux24.in b/src/config/Makefile.ia64_linux24.in
new file mode 100644
index 000000000..9635c318e
--- /dev/null
+++ b/src/config/Makefile.ia64_linux24.in
@@ -0,0 +1,43 @@
+# 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 = @LINUX_VERSION@
+
+#
+# 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
+MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
+XLDFLAGS=
+SHARE_LDFLAGS = -shared -Xlinker -x
+SHLIB_SUFFIX=so
+SHLIB_CFLAGS=
+#
+# libraries
+MTLIBS=-lpthread
+TXLIBS= /usr/lib/libncurses.so
+XLIBS= @LIB_AFSDB@
+#
+# programs
+AR=ar
+AS=as
+CP=cp
+LD=ld
+MT_CC=cc
+MV=mv
+RANLIB=ranlib
+RM=rm
+INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+#
+# Other OS specific requirements
+#
+YACC = bison -y
+LEX = flex -l
diff --git a/src/kauth/client.c b/src/kauth/client.c
index 8678c579c..1351ae8ce 100644
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -44,6 +44,10 @@ RCSID("$Header$");
 #include <strings.h>
 #endif
 #endif
+#ifdef HAVE_UNISTD_H
+#define __USE_XOPEN
+#include <unistd.h>
+#endif
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 90438f1dc..30cf98e2b 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -90,7 +90,7 @@ CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) \
         -mdisable-fpregs -ffunction-sections -march=1.1 -mschedule=7100
 DEFINES = -D__KERNEL__  -D__linux__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
 <ia64_linux24>
-CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) -fno-strict-aliasing -pipe \
+CCFLAGS =   $(KDEBUG) -O2 $(FOMIT) -fno-strict-aliasing -fno-common -pipe \
 	-ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step
 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL ${SMP_DEF} -DMODULE
 <all>