23c23
< # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
---
> # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
26d25
< # ident	"%Z%%M%	%I%	%E% SMI"
28,29d26
< # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T.
< # All rights reserved.
40,41c37,38
< 	MOE=`/usr/bin/moe -32 '/usr/lib/libc/$HWCAP'`
< 	if [ -n "$MOE" ]; then
---
> 	LIBC_MOE_32=`/usr/bin/moe -32 '/usr/lib/libc/$HWCAP'`
> 	if [ -n "$LIBC_MOE_32" ]; then
44c41
< 			/usr/sbin/mount -O -F lofs $MOE /lib/libc.so.1
---
> 			/usr/sbin/mount -O -F lofs $LIBC_MOE_32 /lib/libc.so.1
46a44,53
> 
> 	ARCH64=`isainfo | awk '{print $1}'`
> 	LIBC_MOE_64=`/usr/bin/moe -64 /usr/lib/$ARCH64/libc/'$HWCAP'`
> 	if [ -n "$LIBC_MOE_64" ]; then
> 		/usr/sbin/mount | egrep -s "^/lib/$ARCH64/libc.so.1 on "
> 		if [ $? -ne 0 ]; then
> 			/usr/sbin/mount -O -F lofs $LIBC_MOE_64 \
> 				/lib/$ARCH64/libc.so.1
> 		fi
> 	fi
137c144,149
< 		sun4v_libc_psr_mount 
---
> 		# Check if we already loaded libc_hwcapX.so.1 thru libc_mount
> 		# We can get rid of this check (and the libc_psr mount),
> 		# if all the sun4v platforms start using libc_hwcap.
> 		if [ ! -n "$LIBC_MOE_32" ]; then
> 			sun4v_libc_psr_mount
> 		fi