6932417 Sparc: Aten Build20.0 snv_133 failed under -xO3 w/ '_memset' undefined symbol (building libgenunix)

4 files changed, 29 insertions, 31 deletions

diff --git a/usr/src/common/util/memcpy.c b/usr/src/common/util/memcpy.c
index 0f239e5869..94b593b7ef 100644
--- a/usr/src/common/util/memcpy.c
+++ b/usr/src/common/util/memcpy.c
@@ -20,27 +20,22 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * The SunStudio compiler may generate calls to _memcpy and so we
- * need to make sure that the correct symbol exists for these calls,
- * whether it be libc (first case below) or the kernel (second case).
- */
-
 #if !defined(_KMDB) && !defined(_BOOT) && !defined(_KERNEL)
 
 #include "lint.h"
 
 #endif /* !_KMDB && !_BOOT && !_KERNEL */
 
+/*
+ * The SunStudio compiler may generate calls to _memcpy; So we
+ * need to make sure that the correct symbol exists for these calls.
+ */
 #pragma weak _memcpy = memcpy
 
 #include <sys/types.h>
diff --git a/usr/src/common/util/memmove.c b/usr/src/common/util/memmove.c
index 7e7abb9e08..5d8f197a11 100644
--- a/usr/src/common/util/memmove.c
+++ b/usr/src/common/util/memmove.c
@@ -20,22 +20,24 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if !defined(_KMDB) && !defined(_KERNEL)
 
-#pragma weak _memmove = memmove
-
 #include "lint.h"
+
 #endif /* !_KMDB && !_KERNEL */
 
+/*
+ * The SunStudio compiler may generate calls to _memmove; So we
+ * need to make sure that the correct symbol exists for these calls.
+ */
+#pragma weak _memmove = memmove
+
 #include <sys/types.h>
 
 #if defined(_KERNEL)
diff --git a/usr/src/common/util/memset.c b/usr/src/common/util/memset.c
index 9236d49f3b..dce59538e8 100644
--- a/usr/src/common/util/memset.c
+++ b/usr/src/common/util/memset.c
@@ -20,22 +20,24 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if !defined(_KMDB) && !defined(_BOOT) && !defined(_KERNEL)
 
-#pragma weak _memset = memset
-
 #include "lint.h"
+
 #endif /* !_KMDB && !_BOOT && !_KERNEL */
 
+/*
+ * The SunStudio compiler may generate calls to _memset; So we
+ * need to make sure that the correct symbol exists for these calls.
+ */
+#pragma weak _memset = memset
+
 #include <sys/types.h>
 
 #if defined(_KERNEL)
diff --git a/usr/src/common/util/memstr.c b/usr/src/common/util/memstr.c
index 360ac9a88f..f4e7289117 100644
--- a/usr/src/common/util/memstr.c
+++ b/usr/src/common/util/memstr.c
@@ -19,12 +19,9 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #if defined(_BOOT)
 #include <sys/salib.h>
 #else
@@ -35,7 +32,12 @@
  * Implementations of functions described in memory(3C).
  * These functions match the section 3C manpages.
  */
-
+/*
+ * The SunStudio compiler may generate calls to _memmove, _memset,
+ * and _memcpy; So we need to make sure that the correct symbols
+ * exist for these calls.
+ */
+#pragma weak _memmove = memmove
 void *
 memmove(void *s1, const void *s2, size_t n)
 {
@@ -47,6 +49,7 @@ memmove(void *s1, const void *s2, size_t n)
 	return (s1);
 }
 
+#pragma weak _memset = memset
 void *
 memset(void *s, int c, size_t n)
 {
@@ -77,10 +80,6 @@ memcmp(const void *s1, const void *s2, size_t n)
 	return (0);
 }
 
-/*
- * The SunStudio compiler may generate calls to _memcpy and so we
- * need to make sure that the correct symbol exists for these calls.
- */
 #pragma weak _memcpy = memcpy
 void *
 memcpy(void *s1, const void *s2, size_t n)