From 05bfda27b677dda73bcebfd1e879dd8172cbc6c6 Mon Sep 17 00:00:00 2001
From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Mon, 21 Feb 2005 01:15:04 +0000
Subject: [PATCH] STABLE14-solaris-x8664-support-20050216

FIXES 17628

add amd64 support for solaris 10


(cherry picked from commit 66735f54b79bcc610f6185df98d9caeab8476a8b)
---
 src/afsd/afs.rc.solaris.2.9         | 3 +++
 src/cf/osconf.m4                    | 8 ++++----
 src/config/param.sunx86_510.h       | 2 +-
 src/libafs/MakefileProto.SOLARIS.in | 9 ++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/afsd/afs.rc.solaris.2.9 b/src/afsd/afs.rc.solaris.2.9
index b4c91e0f5..2f6d28555 100644
--- a/src/afsd/afs.rc.solaris.2.9
+++ b/src/afsd/afs.rc.solaris.2.9
@@ -62,6 +62,9 @@ fi
 ## If sparcv9 then the location of the afs and nfs extensions differ
 
 case `/bin/isalist` in
+    *amd64* )
+              nfssrv=/kernel/misc/amd64/nfssrv
+              afs=/kernel/fs/amd64/afs ;;
     *sparcv9* )
               nfssrv=/kernel/misc/sparcv9/nfssrv
               afs=/kernel/fs/sparcv9/afs ;;
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 2b713414b..58fd94aa8 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -786,7 +786,7 @@ case $AFS_SYSNAME in
 		SHLIB_CFLAGS="-KPIC"
 		SHLIB_LDFLAGS="-G -Bsymbolic"
 		TXLIBS="-lcurses"
-		XCFLAGS64='${XCFLAGS} -xarch=v9'
+		XCFLAGS64='${XCFLAGS} -xarch=amd64'
 		XCFLAGS="-dy -Bdynamic"
 		XLIBELFA="-lelf"
 		XLIBKVM="-lkvm"
@@ -807,7 +807,7 @@ case $AFS_SYSNAME in
 		SHLIB_CFLAGS="-KPIC"
 		SHLIB_LDFLAGS="-G -Bsymbolic"
 		TXLIBS="-lcurses"
-		XCFLAGS64='${XCFLAGS} -xarch=v9'
+		XCFLAGS64='${XCFLAGS} -xarch=amd64'
 		XCFLAGS="-dy -Bdynamic"
 		XLIBELFA="-lelf"
 		XLIBKVM="-lkvm"
@@ -828,7 +828,7 @@ case $AFS_SYSNAME in
 		SHLIB_CFLAGS="-KPIC"
 		SHLIB_LDFLAGS="-G -Bsymbolic"
 		TXLIBS="-lcurses"
-		XCFLAGS64='${XCFLAGS} -xarch=v9'
+		XCFLAGS64='${XCFLAGS} -xarch=amd64'
 		XCFLAGS="-dy -Bdynamic"
 		XLIBELFA="-lelf"
 		XLIBKVM="-lkvm"
@@ -849,7 +849,7 @@ case $AFS_SYSNAME in
 		SHLIB_CFLAGS="-KPIC"
 		SHLIB_LDFLAGS="-G -Bsymbolic"
 		TXLIBS="-lcurses"
-		XCFLAGS64='${XCFLAGS} -xarch=v9'
+		XCFLAGS64='${XCFLAGS} -xarch=amd64'
 		XCFLAGS="-dy -Bdynamic"
 		XLIBELFA="-lelf"
 		XLIBKVM="-lkvm"
diff --git a/src/config/param.sunx86_510.h b/src/config/param.sunx86_510.h
index b6d18be70..629fd3246 100644
--- a/src/config/param.sunx86_510.h
+++ b/src/config/param.sunx86_510.h
@@ -97,7 +97,7 @@
   * AFS_SYSCALL32 is used to protect the ILP32 syscall interface
   * AFS_64BIT_ENV is for use of 64 bit inode numbers
   */
-#if defined(__sparcv9)
+#if defined(__amd64)
 #define	AFS_SUN57_64BIT_ENV	1
 #define AFS_64BIT_INO   	1
 #endif
diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index ae3886a9f..a5295d7ce 100644
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -30,13 +30,16 @@ DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 #LD = /usr/ccs/bin/ld
 #LORDER = /usr/ccs/bin/lorder
 #CC = /opt/SUNWspro/bin/cc
-KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
-	-DSYSV -dn ${ARCH_DEFS}
+KDEFS= -D_KERNEL -DSYSV -dn ${ARCH_DEFS}
 
-<sun4x_57 sun4x_58 sun4x_59 sun4x_510 sunx86_57 sunx86_58 sunx86_59 sunx86_510>
+<sun4x_57 sun4x_58 sun4x_59 sun4x_510>
 KDEFS_32 = 
 KDEFS_64 = -xarch=v9 
 
+<sunx86_57 sunx86_58 sunx86_59 sunx86_510>
+KDEFS_32 = 
+KDEFS_64 = -xarch=amd64 -xmodel=kernel
+
 <all>
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
-- 
2.39.5