STABLE12-solaris-x86-58-support-20030113

needed for patch

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

make 1.2.x work on solaris 8 x86

diff --git a/Makefile.in b/Makefile.in
index 23c8c57198e686c9e335efe6a186ded4477f867e..84700b62af8f8ed08ca6d399c09185fcaae64e06 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,7 +264,7 @@ null: project
 
 gtx: project null auth # kauth rxkad ?
        case ${SYS_NAME} in \
-         rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \
+         rs_aix* | sun*_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \
                $(RM) -f ${TOP_LIBDIR}/libtermlib.a; \
                ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a; \
                ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
@@ -314,7 +314,7 @@ login: project kauth rxkad
                ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
        parisc_linux24) \
                echo Skipping pam/login for parisc_linux24 ;; \
-       sun4x_* | hp_ux11* | *linux* | *fbsd* ) \
+       sun*_* | hp_ux11* | *linux* | *fbsd* ) \
                ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \
        ppc_darwin* | *_obsd* ) \
                echo Skipping login for ${SYS_NAME} ;; \
@@ -414,7 +414,7 @@ butc: project bubasics butm budb bucoord cmd
 
 tbutc: project bubasics butm budb bucoord cmd butc
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux110) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix4*|*linux*|hp_ux110) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT butc for ${SYS_NAME} ;; \
@@ -437,7 +437,7 @@ tests: rxtests ubiktests
 # pthread based user space RX library
 libafsrpc: rx rxkad des
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110|*fbsd*) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux110|*fbsd*) \
        ${COMPILE_PART1} libafsrpc  ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
@@ -445,7 +445,7 @@ libafsrpc: rx rxkad des
 
 libafsauthent: ubik auth kauth libafsrpc
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110|*fbsd*) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux110|*fbsd*) \
        ${COMPILE_PART1} libafsauthent  ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
@@ -453,7 +453,7 @@ libafsauthent: ubik auth kauth libafsrpc
 
 shlibafsrpc: rx rxkad des
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux110) \
        ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
        *) \
                echo Not building shared libafsrpc for ${SYS_NAME} ;; \
@@ -461,7 +461,7 @@ shlibafsrpc: rx rxkad des
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux110) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux110) \
        ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
        *) \
                echo Not building shared libafsrpc for ${SYS_NAME} ;; \
@@ -481,7 +481,7 @@ libadmin_real:
 
 libadmin: libafsauthent bozo
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
+       alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux110) \
                        $(MAKE) libadmin_real ;; \
        *) \
                echo Not building MT libadmin for ${SYS_NAME} ;; \
@@ -769,7 +769,7 @@ package.files: package
 ntp: project volser
        @case ${WITH_OBSOLETE} in \
        YES)    case ${SYS_NAME} in \
-               sun4x_58 | sunx86_* | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
+               sun*_5[89] | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
                * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
                esac ;; \
        *)      echo skipping deprecated target: ntp ;; \

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 67bf2fee0a65b349a89e0332ad7af87f380b9113..9d4ab45422da6a5aa47bbd2f07838a63250532cb 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -99,13 +99,13 @@ dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys
                        esac;; \
                sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4m_54 | sun4_54 | sun4c_54 | sunx86_54) \
                        ${INSTALL} -f afs.rc.solaris ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
-               sun4x_57 ) \
+               sun*_57 ) \
                        ${INSTALL} -f afs.rc.solaris.2.7 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
-               sun4x_58 ) \
+               sun*_58 ) \
                        ${INSTALL} -f afs.rc.solaris.2.8 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
-               sun4x_59 ) \
+               sun*_59 ) \
                        ${INSTALL} -f afs.rc.solaris.2.9 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
-                sun4x_5? ) \
+                sun*_5? ) \
                         ${INSTALL} -f afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\
                alpha_osf* ) \
                        ${INSTALL} -f afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index 536ed1912c22f4da0ffc16761fa70fa4ca20d9ce..cbf840ff8dcd058587b23171278da2a8872672f8 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -107,7 +107,7 @@ clean:
 
 install:  
        @case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \
+       alpha_dux*|sgi_*|sun*|rs_aix4*|*linux*|hp_ux*) \
                echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
        *) \
                echo ${INSTALL} butc ${DESTDIR}${sbindir}/butc ; \
@@ -118,7 +118,7 @@ install:
 include ../config/Makefile.version
 dest:  
        @case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \
+       alpha_dux*|sgi_*|sun*|rs_aix4*|*linux*|hp_ux*) \
                echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
        *) \
                echo ${INSTALL} butc ${DEST}/etc/butc ; \

diff --git a/src/config/Makefile.sunx86_58.in b/src/config/Makefile.sunx86_58.in
new file mode 100644 (file)
index 0000000..7b082e2
--- /dev/null
+++ b/src/config/Makefile.sunx86_58.in
@@ -0,0 +1,50 @@
+# Keep macros within each section in sorted order for clean diff displays.
+#
+# AFS_OSTYPE used to indicate suffixes and os specific subdirectories.
+AFS_OSTYPE = SOLARIS
+#
+# compilation and link editor flags
+XCFLAGS=-dy -Bdynamic
+MT_CFLAGS=-mt -DAFS_PTHREAD_ENV ${XCFLAGS}
+PAM_CFLAGS = -KPIC
+PAMLIBS= -lc -lpam -lsocket -lnsl -lm
+SHLIB_LDFLAGS = -G -Bsymbolic
+LWP_OPTMZ=-g
+OPTMZ=-O
+DBG=-g
+
+## Compilation flags for 64 bit Solaris
+XCFLAGS64 = ${XCFLAGS} -xarch=v9
+
+SHLIB_SUFFIX=so
+SHLIB_LINKER=${CC} -G -dy -Wl,-Mmapfile -Bsymbolic -z text
+#
+# libraries
+XLIBS=@LIB_AFSDB@ -lsocket -lnsl -lintl -ldl 
+TXLIBS=-lcurses
+MTLIBS=-lpthread -lsocket
+XLIBELFA=-lelf
+XLIBKVM=-lkvm
+#
+SHLIB_SUFFIX=so
+SHLIB_CFLAGS=-KPIC
+#
+# programs
+AR=/usr/ccs/bin/ar
+AS=as
+CC=/opt/SUNWspro/bin/cc
+MT_CC=/opt/SUNWspro/bin/cc
+CP=/bin/cp
+LEX=lex
+LD= /usr/ccs/bin/ld
+LORDER = /usr/ccs/bin/lorder
+MV=mv
+RANLIB=/bin/true
+RM=rm
+STRIP= /usr/ccs/bin/strip
+INSTALL=${TOP_SRCDIR}/pinstall/pinstall
+#
+# this is for the vol package
+FS_CONV_SOL26         = fs_conv_sol26
+install_FS_CONV_SOL26 = $(DESTDIR)${afssrvsbindir}/fs_conv_sol26
+dest_FS_CONV_SOL26    = $(DEST)/root.server/usr/afs/bin/fs_conv_sol26

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index a5b7c574f30cff4f5777a1c2f643a64dc1e15f84..2a10f23c85b89bb87097f982ad89db5149284d78 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -51,27 +51,30 @@ DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
        -DSYSV -dn ${ARCH_DEFS}
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 KDEFS_32 = 
+<sun4x_57 sun4x_58 sun4x_59>
 KDEFS_64 = -xarch=v9
 
 <all>
 CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
-<all -sun4x_57 -sun4x_58 -sun4x_59>
+<all -sun4x_57 -sun4x_58 -sun4x_59 -sunx86_57 -sunx86_58 -sunx86_59>
 KOBJ = MODLOAD
 <sun4x_57 sun4x_58 sun4x_59>
 KOBJ = MODLOAD32 MODLOAD64
+<sunx86_57 sunx86_58 sunx86_59>
+KOBJ = MODLOAD32
 
 
 # This tells Makefile.common to use it's single directory build target.
-<all -sun4x_57 -sun4x_58 -sun4x_59>
+<all -sun4x_57 -sun4x_58 -sun4x_59 -sunx86_57 -sunx86_58 -sunx86_59>
 COMPDIRS = single_compdir
 INSTDIRS = single_instdir
 DESTDIRS = single_destdir
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 COMPDIRS = solaris_compdirs
 INSTDIRS = solaris_instdirs
 DESTDIRS = solaris_destdirs
@@ -103,7 +106,7 @@ setup:
 ## This is the target for a Solaris 7. Here we build both the 32 bit and
 ## the 64 bit libafs in MODLOAD32 and MODLOAD64 directories respectively
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        for t in ${KOBJ} ; do \
                echo Building directory: $$t ; \
@@ -132,7 +135,7 @@ solaris_destdirs_libafs: dest_libafs
 LIBAFS = libafs.o
 LIBAFSNONFS = libafs.nonfs.o
 
-<all -sun4x_57 -sun4x_58 -sun4x_59>
+<all -sun4x_57 -sun4x_58 -sun4x_59 -sunx86_57 -sunx86_58 -sunx86_59>
 INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
 INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
 
@@ -168,7 +171,7 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@  $(AFSAOBJS) ${AFSNONFSOBJS}
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 
 libafs: ${LIBAFSNONFS} ${LIBAFS}
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 021028954a2e2b8072593d390050a81d7b436862..55b55b8530b37ba99ce5c89c8e20edf7dc10c940 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -351,7 +351,7 @@ base64.o: ${UTIL}/base64.c
 
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
-            sun4x_5* | sunx86_5*) \
+            sun*_5* ) \
                /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 30f3af868bd4cb55d67e7cf5e535743c8daf4232..4082ae84585e7f7398185c9432c32421c46bd114 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -98,7 +98,7 @@ tests:        pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 
 syscall.o: syscall.s
        case "$(SYS_NAME)" in \
-        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
+        sun*_5? ) \
                /usr/ccs/lib/cpp  ${SFLAGS} syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 287d9f2d1c6321e3cf61c366f614ee67d64d34bd..b14a84256bf50f95eddcc47999d3b6d5eb293983 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -107,7 +107,7 @@ cbd: cbd.o
 
 ${DEST}/root.server/usr/afs/bin/fileserver: fileserver
        @case ${SYS_NAME} in \
-       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \
+       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun*) \
        echo "Don't install fileserver for ${SYS_NAME}" ;; \
        *) \
        echo ${INSTALL} -ns $? $@ ; \
@@ -125,7 +125,7 @@ clean:
 include ../config/Makefile.version
 ${DESTDIR}${afssrvlibexecdir}/fileserver: fileserver
        @case ${SYS_NAME} in \
-       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \
+       alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun*) \
        echo "Don't install fileserver for ${SYS_NAME}" ;; \
        *) \
        echo ${INSTALL} -ns $? $@ ; \