[linuxsh-dev] "new" toolchain->kernel compile errors?

[NIIBE Y. <gn...@m1...>]

Bryan Rittmeyer wrote:
 > sh-linux-gnu-gcc -D__ASSEMBLY__ -D__KERNEL__
 > -I/home/bryan/tmp/kernel/include -ml -m4-nofpu   -c -o entry.o entry.S
 > entry.S: Assembler messages:
 > entry.S:376: Error: must be @(r0,...)
 > entry.S:377: Error: must be @(r0,...)
 > entry.S:378: Error: must be @(r0,...)
 > entry.S:379: Error: must be @(r0,...)
 > entry.S:380: Error: must be @(r0,...)
 > entry.S:434: Error: must be @(r0,...)
 > make[1]: *** [entry.o] Error 1
 > make[1]: Leaving directory `/home/bryan/tmp/kernel/arch/sh/kernel'

I've just committed following change, I've got from Denis. 


2001-01-10  Denis Dowling <dp...@pr...>

	* arch/sh/kernel/entry.S: Change RX-->OFF_RX.


Index: arch/sh/kernel/entry.S
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/entry.S,v
retrieving revision 1.30
diff -u -r1.30 entry.S
--- arch/sh/kernel/entry.S	2001/01/02 16:03:51	1.30
+++ arch/sh/kernel/entry.S	2001/01/10 07:12:27
@@ -89,16 +89,16 @@
 #endif
 
 /* Offsets to the stack */
-R0         =  0		/* Return value. New ABI also arg4 */
-R1         =  4     	/* New ABI: arg5 */
-R2         =  8     	/* New ABI: arg6 */
-R3         =  12     	/* New ABI: syscall_nr */
-R4         =  16     	/* New ABI: arg0 */
-R5         =  20     	/* New ABI: arg1 */
-R6         =  24     	/* New ABI: arg2 */
-R7         =  28     	/* New ABI: arg3 */
+OFF_R0         =  0		/* Return value. New ABI also arg4 */
+OFF_R1         =  4     	/* New ABI: arg5 */
+OFF_R2         =  8     	/* New ABI: arg6 */
+OFF_R3         =  12     	/* New ABI: syscall_nr */
+OFF_R4         =  16     	/* New ABI: arg0 */
+OFF_R5         =  20     	/* New ABI: arg1 */
+OFF_R6         =  24     	/* New ABI: arg2 */
+OFF_R7         =  28     	/* New ABI: arg3 */
 SP	   =  (15*4)
-SR	   =  (16*4+8)
+SOFF_R	   =  (16*4+8)
 SYSCALL_NR =  (16*4+6*4)
 
 
@@ -373,11 +373,11 @@
 	!   	    	    	from the kernel stack anyway, so don't need
 	!   	    	    	to be reloaded here.)  This allows the parent
 	!   	    	    	to rewrite system calls and args on the fly.
-	mov.l	@(R4,r15), r4   ! arg0
-	mov.l	@(R5,r15), r5
-	mov.l	@(R6,r15), r6
-	mov.l	@(R7,r15), r7   ! arg3
-	mov.l	@(R3,r15), r3   ! syscall_nr
+	mov.l	@(OFF_R4,r15), r4   ! arg0
+	mov.l	@(OFF_R5,r15), r5
+	mov.l	@(OFF_R6,r15), r6
+	mov.l	@(OFF_R7,r15), r7   ! arg3
+	mov.l	@(OFF_R3,r15), r3   ! syscall_nr
 	!   	    	    Arrange for syscall_trace() to be called
 	!   	    	    again as the system call returns.
 	mov.l	__syscall_ret_trace, r10
@@ -407,7 +407,7 @@
 
 	! In case of trace
 syscall_ret_trace:
-	mov.l	r0, @(R0,r15)		! save the return value
+	mov.l	r0, @(OFF_R0,r15)		! save the return value
 	mov.l	__syscall_trace, r1
 	mova	SYMBOL_NAME(ret_from_syscall), r0
 	jmp	@r1    	! Call syscall_trace() which notifies superior
@@ -535,7 +535,7 @@
 	/* fall through */
 #endif
 syscall_ret:
-	mov.l	r0, @(R0,r15)	! save the return value
+	mov.l	r0, @(OFF_R0,r15)	! save the return value
 	/* fall through */
 
 ENTRY(ret_from_syscall)