- Fix the path encoded in the multiple inclusion protection.

- GCC uses 32-byte function alignment for UltraSPARC CPUs.
- Remove code duplication.

Approved by:	core, pjd
MFC after:	2 weeks

1 files changed, 13 insertions, 36 deletions

diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h b/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h
index b2a3c16..d694ea4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h
@@ -24,8 +24,8 @@
  * Use is subject to license terms.
  */
 
-#ifndef _IA32_SYS_ASM_LINKAGE_H
-#define	_IA32_SYS_ASM_LINKAGE_H
+#ifndef _SYS_ASM_LINKAGE_H
+#define	_SYS_ASM_LINKAGE_H
 
 #ifdef	__cplusplus
 extern "C" {
@@ -41,6 +41,17 @@ extern "C" {
 
 #define	ASM_ENTRY_ALIGN	16
 
+#elif defined(__sparc64__)
+
+/* GCC uses 32-byte function alignment for UltraSPARC CPUs. */
+#define	ASM_ENTRY_ALIGN	32
+
+#else
+
+#error Unsupported architecture.
+
+#endif
+
 /*
  * ENTRY provides the standard procedure entry code and an easy way to
  * insert the calls to mcount for profiling. ENTRY_NP is identical, but
@@ -67,40 +78,6 @@ x:
 #define	SET_SIZE(x) \
 	.size	x, [.-x]
 
-#elif defined(__sparc64__)
-
-/*
- * ENTRY provides the standard procedure entry code and an easy way to
- * insert the calls to mcount for profiling. ENTRY_NP is identical, but
- * never calls mcount.
- */
-#define	ENTRY(x) \
-	.section	".text"; \
-	.align	4; \
-	.global	x; \
-	.type	x, @function; \
-x:
-
-/*
- * ALTENTRY provides for additional entry points.
- */
-#define	ALTENTRY(x) \
-	.global	x; \
-	.type	x, @function; \
-x:
-
-/*
- * SET_SIZE trails a function and set the size for the ELF symbol table.
- */
-#define	SET_SIZE(x) \
-	.size	x, (.-x)
-
-#else
-
-#error Unsupported architecture.
-
-#endif
-
 #endif /* _ASM */
 
 #ifdef	__cplusplus