From cddd5e74f7edf4ab27584f64362e359bf1d8d1c7 Mon Sep 17 00:00:00 2001
From: Mark Vitale <mvitale@sinenomine.net>
Date: Thu, 16 Mar 2023 20:17:06 +0000
Subject: [PATCH] SOLARIS: Specify -m64 for Solaris 11 kernel builds

For 64-bit Solaris 11 kernel builds on SPARC, use '-m64' instead of the
long-deprecated "-xarch=v9".  This will eliminate the warning:

  Warning: -xarch=v9 is deprecated, use -m64 to create 64-bit programs

The two options are functionally equivalent, so no functional change
should be incurred by this commit.

Change-Id: I6a4043a9e6dfad509fe1be3dd4071e5e77d31133
Reviewed-on: https://gerrit.openafs.org/15360
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
---
 src/libafs/MakefileProto.SOLARIS.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index 1e6a2aa356..10d02b7b70 100644
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -45,10 +45,14 @@ KDEFS= -D_KERNEL -DSYSV -dn ${ARCH_DEFS}
 <sunx86_510 sunx86_511>
 DBUG= -Wu,-save_args
 
-<sun4x_58 sun4x_59 sun4x_510 sun4x_511>
+<sun4x_58 sun4x_59 sun4x_510>
 KDEFS_32 = -xarch=v8
 KDEFS_64 = -xarch=v9 
 
+<sun4x_511>
+KDEFS_32 =
+KDEFS_64 = -m64
+
 <sunx86_58 sunx86_59 sunx86_510>
 KDEFS_32 = 
 KDEFS_64 = -xarch=amd64 -xmodel=kernel