From: Evan Shaw <chickencha@gmail.com>
Date: Sat, 2 Apr 2011 00:46:01 +0000 (-0400)
Subject: syscall: make Syscall6 pass 6th arg on linux/386
X-Git-Tag: weekly.2011-04-04~26
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=46137557c48fa44d558de0e95c5c2f7d368e9190;p=gostls13.git

syscall: make Syscall6 pass 6th arg on linux/386

R=rsc
CC=golang-dev
https://golang.org/cl/4350043
---

diff --git a/src/pkg/syscall/asm_linux_386.s b/src/pkg/syscall/asm_linux_386.s
index 52cd6e7419..404a8f3eda 100644
--- a/src/pkg/syscall/asm_linux_386.s
+++ b/src/pkg/syscall/asm_linux_386.s
@@ -34,7 +34,6 @@ ok:
 	RET
 
 // func Syscall6(trap uintptr, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
-// Actually Syscall5 but the rest of the code expects it to be named Syscall6.
 TEXT	·Syscall6(SB),7,$0
 	CALL	runtime·entersyscall(SB)
 	MOVL	4(SP), AX	// syscall entry
@@ -43,7 +42,7 @@ TEXT	·Syscall6(SB),7,$0
 	MOVL	16(SP), DX
 	MOVL	20(SP), SI
 	MOVL	24(SP), DI
-	// 28(SP) is ignored
+	MOVL	28(SP), BP
 	INT	$0x80
 	CMPL	AX, $0xfffff001
 	JLS	ok6