- Fix placement of cvs ids in previous commit to match .S files in libc.

- gcc uses 32 byte alignment for functions regardless of profiling, so
  follow suit.

sys/sparc64/include/asm.h

@@ -70,19 +70,10 @@
 #define CNAME(csym)		csym
 #define HIDENAME(asmsym)	__CONCAT(.,asmsym)
 
-/* sys/sparc64/sparc64/ *.S have their own definitions. */
-#ifndef CCFSZ
-#define	CCFSZ	192	/* 0xc0 */
-#endif
-#ifndef	SPOFF
-#define	SPOFF	2047	/* 0x7ff */
-#endif
+#define	CCFSZ	192
+#define	SPOFF	2047
 
-#ifdef GPROF
 #define	_ALIGN_TEXT	.align 32
-#else
-#define	_ALIGN_TEXT	.p2align 4
-#endif
 
 #define _START_ENTRY \
 	.text ; \

sys/sparc64/sparc64/exception.S

@@ -53,6 +53,9 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_compat.h"
 #include "opt_ddb.h"
 
@@ -65,9 +68,6 @@
 #include <machine/wstate.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 #define	TSB_KERNEL_MASK	0x0
 #define	TSB_KERNEL	0x0

sys/sparc64/sparc64/genassym.c

@@ -258,9 +258,6 @@ ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active));
 ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context));
 ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb));
 
-ASSYM(CCFSZ, sizeof(struct frame));
-ASSYM(SPOFF, SPOFF);
-
 ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));
 
 ASSYM(_JB_FP, offsetof(struct _jmp_buf, _jb[_JB_FP]));

sys/sparc64/sparc64/interrupt.S

@@ -24,15 +24,15 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/asi.h>
 #include <machine/asmacros.h>
 #include <machine/ktr.h>
 #include <machine/pstate.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 /*
  * Handle a vectored interrupt.

sys/sparc64/sparc64/locore.S

@@ -24,7 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/syscall.h>
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include <machine/asi.h>
 #include <machine/asmacros.h>
@@ -32,9 +33,6 @@
 #include <machine/upa.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 	.register %g2,#ignore
 

sys/sparc64/sparc64/mp_exception.S

@@ -24,15 +24,15 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/asi.h>
 #include <machine/ktr.h>
 #include <machine/asmacros.h>
 #include <machine/pstate.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 	.register	%g2, #ignore
 	.register	%g3, #ignore

sys/sparc64/sparc64/mp_locore.S

@@ -24,6 +24,9 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/asi.h>
 #include <machine/asmacros.h>
 #include <machine/ktr.h>
@@ -31,9 +34,6 @@
 #include <machine/upa.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 	.register	%g2, #ignore
 	.register	%g3, #ignore

sys/sparc64/sparc64/support.S

@@ -24,15 +24,15 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/asi.h>
 #include <machine/asmacros.h>
 #include <machine/ktr.h>
 #include <machine/pstate.h>
 
 #include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 
 	.register %g2, #ignore
 	.register %g3, #ignore

sys/sparc64/sparc64/swtch.S

@@ -24,19 +24,19 @@
  * SUCH DAMAGE.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/asmacros.h>
 #include <machine/asi.h>
 #include <machine/ktr.h>
 #include <machine/tstate.h>
 
+#include "assym.s"
+
 	.register	%g2, #ignore
 	.register	%g3, #ignore
 
-#include "assym.s"
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
 /*
  * void cpu_throw(struct thread *old, struct thread *new)
  */