[LV-kern-commit] CVS: kernel-2.4/arch/vax/kernel cpu_generic.c,1.2,1.3 cpu_ka55.c,1.8,1.9 process.c,1.16,1.17 syscall.c,1.9,1.10

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv26486

Modified Files:
	cpu_generic.c cpu_ka55.c process.c syscall.c 
Log Message:
DA: gcc-latest changed asm .. every line must be quoted (gcc-latest
doesn't work yet.. just started testing..)


Index: cpu_generic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_generic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpu_generic.c	26 Jun 2001 18:59:00 -0000	1.2
+++ cpu_generic.c	1 Feb 2003 05:19:12 -0000	1.3
@@ -75,10 +75,8 @@
 
 void ka46_48_49_prom_putchar(int c)
 {
-  asm ("
-      movzbl %0, r2   # zero-extended byte convert.
-      jsb 0x20040068
-      "
+  asm ("movzbl %0, r2   # zero-extended byte convert. \n"
+      "jsb 0x20040068\n"
        : /* nothing */
        : "g" (c)
        : "r2" );
@@ -94,10 +92,8 @@
 
 void ka4x_prom_putchar(int c)
 {
-  asm ("
-      movzbl %0, r2   # zero-extended byte convert.
-      jsb 0x20040058
-      "
+  asm (" movzbl %0, r2   # zero-extended byte convert.\n"
+      "jsb 0x20040058 \n"
        : /* nothing */
        : "g" (c)
        : "r2" );

Index: cpu_ka55.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka55.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cpu_ka55.c	2 Dec 2002 02:55:12 -0000	1.8
+++ cpu_ka55.c	1 Feb 2003 05:19:12 -0000	1.9
@@ -65,14 +65,13 @@
 
 void ka55_prom_putchar(int c)
 {
-	asm ("
-		movl $0x2014044b, r11     # console page addr
-	1:
-		jsb *0x20(r11)           # ready to TX?
-		blbc r0, 1b
-		movl %0, r1
-		jsb *0x24(r11)           # TX char in R11
-	" : /* no outputs */ 
+	asm (" movl $0x2014044b, r11     # console page addr\n"
+	"1:\n"
+		"jsb *0x20(r11)           # ready to TX? \n"
+		"blbc r0, 1b\n"
+		"movl %0, r1\n"
+		"jsb *0x24(r11)           # TX char in R11 \n"
+	  : /* no outputs */ 
 	  : "g"(c) 
 	  : "r0", "r1", "r11" );
 }

Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- process.c	9 Apr 2002 13:50:55 -0000	1.16
+++ process.c	1 Feb 2003 05:19:12 -0000	1.17
@@ -61,16 +61,16 @@
    
         /* svpctx should deal with writing the stuff into *prev */
         
-	asm("	movl %1, r11	\n
-		movpsl -(sp)	\n
-		pushab 1f	\n
-		mtpr %4,%5	\n
-		svpctx          \n
-		mtpr %2, %3	\n
-		ldpctx          \n
-		rei		\n
-	     1:			\n
-		movl r11, %0"
+	asm("	movl %1, r11	\n"
+	"	movpsl -(sp)	\n"
+	"	pushab 1f	\n"
+	"	mtpr %4,%5	\n"
+	"	svpctx          \n"
+	"	mtpr %2, %3	\n"
+	"	ldpctx          \n"
+	"	rei		\n"
+	"1:			\n"
+	"	movl r11, %0"
                 : "=g"(retval)
                 : "g"(prev),
 		  "r"(pcbb), "g"(PR_PCBB),
@@ -171,15 +171,15 @@
 
 pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 {
-	asm("	clrl -(sp)		\n
-		movl %0, -(sp)	\n
-		pushl $0x2		\n
-		movl sp, ap		\n
-		chmk %1			\n
-		tstl r0			\n
-		beql child		\n
-		ret			\n
-	    child:"
+	asm("	clrl -(sp)		\n"
+	"	movl %0, -(sp)	\n"
+	"	pushl $0x2		\n"
+	"	movl sp, ap		\n"
+	"	chmk %1			\n"
+	"	tstl r0			\n"
+	"	beql child		\n"
+	"	ret			\n"
+	    "child:"
 	     	: /* no outputs */
 		: "g"(flags|CLONE_VM),
 		  "g"(__NR_clone)

Index: syscall.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/syscall.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syscall.c	9 Apr 2002 13:50:55 -0000	1.9
+++ syscall.c	1 Feb 2003 05:19:12 -0000	1.10
@@ -99,17 +99,17 @@
 	   We'll sort this out later... - KPH 2000-10-16 */
         /* atp aug 2001, FIXME: ptrace/strace syscall stuff */
 
-	__asm__("  pushl %1             \n
-		   subl2 %2,sp          \n
-		1: movc3 %2,4(%4),(sp)  \n
-		   calls %3, %5         \n
-		   brb 3f               \n
-		2: movl %6, r0          \n
-                3: movl r0, %0          \n
-		.section ex_table,\"a\" \n
-			.align 2        \n
-			.long 1b, 2b    \n
-		.text"
+	__asm__("  pushl %1             \n"
+	"	   subl2 %2,sp          \n"
+	"	1: movc3 %2,4(%4),(sp)  \n"
+	"	   calls %3, %5         \n"
+	"	   brb 3f               \n"
+	"	2: movl %6, r0          \n"
+        "        3: movl r0, %0          \n"
+	"	.section ex_table,\"a\" \n"
+		"	.align 2        \n"
+		"	.long 1b, 2b    \n"
+	"	.text"
 		: "=g"(regs->r0)
 		: "g"(regs),
 			"g"(nr_args*4), "g"(nr_args+1),