--- a/usr/src/lib/trousers/Makefile.sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/lib/trousers/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. 
 #
-#ident	"@(#)Makefile.sfw	1.9	10/03/15 SMI"
+#ident	"@(#)Makefile.sfw	1.11	10/08/17 SMI"
 
 VER	=	trousers-0.3.4
 TARBALL =	$(VER).tar.gz
@@ -67,7 +66,7 @@
 	(cd $(VER); env - $(CCSMAKE) MAKE=$(CCSMAKE))
 
 all64: $(VER64)/config.status
-	(cd $(VER64); env - $(CCSMAKE) MAKE=$(CCSMAKE))
+	(cd $(VER64); env - LDARCHFLAG="-Wl,-m64" $(CCSMAKE) MAKE=$(CCSMAKE))
 
 install: real-all
 	$(SH) ./install-sfw
@@ -77,7 +76,8 @@
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); \
-	env "CC=$(CC)" "CFLAGS=$(CFLAGS)" "CPPFLAGS=$(CPPFLAGS)" "LIBS=$(LIBS)" \
+	env "CC=$(CC)" "LD=$(CC)" "CFLAGS=$(CFLAGS)" \
+	"CPPFLAGS=$(CPPFLAGS)" "LIBS=$(LIBS)" \
 	PATH=$(SFW_PATH) MAKE=$(CCSMAKE) ./configure $(CONFIGURE_OPTIONS); \
 	$(SHELL) ../fixheaders.ksh src/include/tss; \
 	$(SHELL) ../fixheaders.ksh src/include/trousers; \
@@ -85,11 +85,14 @@
 
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64); \
-	env "CC=$(CC)" "CFLAGS=$(CFLAGS64)" "CPPFLAGS=$(CPPFLAGS64)" "LIBS=$(LIBS)" \
+	env "CC=$(CC)" "LD=$(CC)" "CFLAGS=$(CFLAGS64)" \
+	"CPPFLAGS=$(CPPFLAGS64)" "LIBS=$(LIBS)" \
 	PATH=$(SFW_PATH) MAKE=$(CCSMAKE) ./configure $(CONFIGURE_OPTIONS); \
 	$(SHELL) ../fixheaders.ksh src/include/tss; \
 	$(SHELL) ../fixheaders.ksh src/include/trousers; \
-	$(SHELL) ../fixheaders.ksh src/include)
+	$(SHELL) ../fixheaders.ksh src/include; \
+	$(SED) -e 's/cc -64/cc -m64/g' < libtool > libtool.new; \
+	$(MV) libtool.new libtool)
 
 $(VER)/configure: $(VER)/configure.in
 	(cd $(VER); \