From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 10 Nov 2011 21:18:41 +0000 (-0600)
Subject: SOLARIS: Do not build x86 kernel module on 5.11
X-Git-Tag: upstream/1.8.0_pre1^2~3056
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c6a22d67ff9787ace2249d528eb9db99c5b19427;p=packages%2Fo%2Fopenafs.git

SOLARIS: Do not build x86 kernel module on 5.11

Oracle Solaris 11 no longer supports x86 (amd64 is required). If we
try to build the x86 module, /usr/include/sys/kobj.h complains that
the ISA is unsupported, and refuses to go on. So, just remove
MODLOAD32 from the libafs directories to build on sunx86_511.

Change-Id: Ic18936d1a0f53ed290d885617d313347aa6ce87a
Reviewed-on: http://gerrit.openafs.org/5835
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index eff036c85..d1ca97f06 100644
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -54,9 +54,9 @@ KDEFS_64 = -xarch=amd64 -xmodel=kernel
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
-<all -sun4x_510 sun4x_511>
+<all -sun4x_510 sun4x_511 sunx86_511>
 KOBJ = MODLOAD32 MODLOAD64
-<sun4x_510 sun4x_511>
+<sun4x_510 sun4x_511 sunx86_511>
 KOBJ = MODLOAD64
 
 # This tells Makefile.common to use it's single directory build target.