2 files changed, 20 insertions, 9 deletions
diff --git a/usr/src/cmd/sgs/libconv/common/lddstub.c b/usr/src/cmd/sgs/libconv/common/lddstub.c
index 89978218d7..151ead9078 100644
--- a/usr/src/cmd/sgs/libconv/common/lddstub.c
+++ b/usr/src/cmd/sgs/libconv/common/lddstub.c
@@ -20,11 +20,9 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 
 #include	<unistd.h>
 #include	<strings.h>
@@ -77,17 +75,29 @@ conv_lddstub(int class)
 	if (geteuid()) {
 		if ((class == ELFCLASS32) && (orgflag != -1)) {
 			if (orgflag == 0) {
+				/* BEGIN CSTYLED */
 				if ((orgflag = originlddstub(orgstub,
-				    MSG_ORIG(MSG_ORG_LDDSTUB))) == -1)
+#ifdef	_LP64
+				    MSG_ORIG(MSG_ORG_64LDD_32STUB))) == -1)
+#else
+				    MSG_ORIG(MSG_ORG_32LDD_32STUB))) == -1)
+#endif
 					return (stub);
+				/* END CSTYLED */
 			}
 			stub = (const char *)orgstub;
 		}
 		if ((class == ELFCLASS64) && (orgflag64 != -1)) {
 			if (orgflag64 == 0) {
+				/* BEGIN CSTYLED */
 				if ((orgflag64 = originlddstub(orgstub64,
-				    MSG_ORIG(MSG_ORG_LDDSTUB_64))) == -1)
+#ifdef	_LP64
+				    MSG_ORIG(MSG_ORG_64LDD_64STUB))) == -1)
+#else
+				    MSG_ORIG(MSG_ORG_32LDD_64STUB))) == -1)
+#endif
 					return (stub);
+				/* END CSTYLED */
 			}
 			stub = (const char *)orgstub64;
 		}
diff --git a/usr/src/cmd/sgs/libconv/common/lddstub.msg b/usr/src/cmd/sgs/libconv/common/lddstub.msg
index a2a4b243f7..8913d2ea84 100644
--- a/usr/src/cmd/sgs/libconv/common/lddstub.msg
+++ b/usr/src/cmd/sgs/libconv/common/lddstub.msg
@@ -19,13 +19,14 @@
 # CDDL HEADER END
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
-@ MSG_ORG_LDDSTUB	"/../lib/lddstub"
-@ MSG_ORG_LDDSTUB_64	"/../lib/64/lddstub"
+@ MSG_ORG_32LDD_32STUB	"/../lib/lddstub"
+@ MSG_ORG_32LDD_64STUB	"/../lib/64/lddstub"
+@ MSG_ORG_64LDD_32STUB	"/../../lib/lddstub"
+@ MSG_ORG_64LDD_64STUB	"/../../lib/64/lddstub"
 
 @ MSG_PTH_LDDSTUB	"/usr/lib/lddstub"
 @ MSG_PTH_LDDSTUB_64	"/usr/lib/64/lddstub"