linux-ia64@vger.kernel.org

linux-ia64@vger.kernel.org

[David Mosberger]

The patch below fixes a few bugs related to unwind directives which
the latest (in CVS) assembler correctly complains about.  Some of them
may have been reported by HJ Lu before, but I didn't see them in the
linux-ia64-{release,test}-2.6.12 repositories yet.

	--david

[IA64] Fix a few unwind-directive bogosities

The latest GAS versions (correctly) complain about these errors.

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>

=== arch/ia64/kernel/entry.S 1.90 vs edited ==--- 1.90/arch/ia64/kernel/entry.S	2005-03-28 09:56:34 -08:00
+++ edited/arch/ia64/kernel/entry.S	2005-04-04 14:51:14 -07:00
@@ -777,7 +777,7 @@
 	st8.spill [r2]=r8	// store return value in slot for r8 and set unat bit
 	.mem.offset 8,0
 	st8.spill [r3]=r0	// clear error indication in slot for r10 and set unat bit
-END(ia64_ret_from_ia32_execve_syscall)
+END(ia64_ret_from_ia32_execve)
 	// fall through
 #endif /* CONFIG_IA32_SUPPORT */
 GLOBAL_ENTRY(ia64_leave_kernel)
=== arch/ia64/lib/memcpy_mck.S 1.7 vs edited ==--- 1.7/arch/ia64/lib/memcpy_mck.S	2005-03-18 16:07:39 -08:00
+++ edited/arch/ia64/lib/memcpy_mck.S	2005-04-04 14:51:14 -07:00
@@ -75,6 +75,7 @@
 	mov	f6ð
 	br.cond.sptk .common_code
 	;;
+END(memcpy)
 GLOBAL_ENTRY(__copy_user)
 	.prologue
 // check dest alignment
@@ -524,7 +525,6 @@
 #undef B
 #undef C
 #undef D
-END(memcpy)
 
 /*
  * Due to lack of local tag support in gcc 2.x assembler, it is not clear which
=== arch/ia64/lib/memset.S 1.7 vs edited ==--- 1.7/arch/ia64/lib/memset.S	2004-01-15 17:51:26 -08:00
+++ edited/arch/ia64/lib/memset.S	2005-04-04 14:51:14 -07:00
@@ -57,10 +57,10 @@
 { .mmi
 	.prologue
 	alloc	tmp = ar.pfs, 3, 0, 0, 0
-	.body
 	lfetch.nt1 [dest]			//
 	.save   ar.lc, save_lc
 	mov.i	save_lc = ar.lc
+	.body
 } { .mmi
 	mov	ret0 = dest			// return value
 	cmp.ne	p_nz, p_zr = value, r0		// use stf.spill if value is zero