rendered paste bodyIndex: libgo/go/debug/proc/regs_linux_amd64.go===================================================================--- libgo/go/debug/proc/regs_linux_amd64.go (revision 154106)+++ libgo/go/debug/proc/regs_linux_amd64.go (working copy)@@ -16,14 +16,14 @@ } var names = [...]string{- "rax",- "rbx",- "rcx",- "rdx",- "rsi",- "rdi",- "rbp",- "rsp",+ "ax",+ "bx",+ "cx",+ "dx",+ "si",+ "di",+ "bp",+ "sp", "r8", "r9", "r10",@@ -33,7 +33,7 @@ "r14", "r15", "rip",- "eflags",+ "flags", "cs", "ss", "ds",@@ -48,10 +48,10 @@ //"gs_base", } -func (r *amd64Regs) PC() Word { return Word(r.Rip) }+func (r *amd64Regs) PC() Word { return Word(r.Ip) } func (r *amd64Regs) SetPC(val Word) os.Error {- r.Rip = uint64(val);+ r.Ip = uint64(val); return r.setter(&r.PtraceRegs); } @@ -64,10 +64,10 @@ panic("No link register") } -func (r *amd64Regs) SP() Word { return Word(r.Rsp) }+func (r *amd64Regs) SP() Word { return Word(r.Sp) } func (r *amd64Regs) SetSP(val Word) os.Error {- r.Rsp = uint64(val);+ r.Sp = uint64(val); return r.setter(&r.PtraceRegs); } @@ -76,21 +76,21 @@ func (r *amd64Regs) Get(i int) Word { switch i { case 0:- return Word(r.Rax)+ return Word(r.Ax) case 1:- return Word(r.Rbx)+ return Word(r.Bx) case 2:- return Word(r.Rcx)+ return Word(r.Cx) case 3:- return Word(r.Rdx)+ return Word(r.Dx) case 4:- return Word(r.Rsi)+ return Word(r.Si) case 5:- return Word(r.Rdi)+ return Word(r.Di) case 6:- return Word(r.Rbp)+ return Word(r.Bp) case 7:- return Word(r.Rsp)+ return Word(r.Sp) case 8: return Word(r.R8) case 9:@@ -108,9 +108,9 @@ case 15: return Word(r.R15) case 16:- return Word(r.Rip)+ return Word(r.Ip) case 17:- return Word(r.Eflags)+ return Word(r.Flags) case 18: return Word(r.Cs) case 19:@@ -130,21 +130,21 @@ func (r *amd64Regs) Set(i int, val Word) os.Error { switch i { case 0:- r.Rax = uint64(val)+ r.Ax = uint64(val) case 1:- r.Rbx = uint64(val)+ r.Bx = uint64(val) case 2:- r.Rcx = uint64(val)+ r.Cx = uint64(val) case 3:- r.Rdx = uint64(val)+ r.Dx = uint64(val) case 4:- r.Rsi = uint64(val)+ r.Si = uint64(val) case 5:- r.Rdi = uint64(val)+ r.Di = uint64(val) case 6:- r.Rbp = uint64(val)+ r.Bp = uint64(val) case 7:- r.Rsp = uint64(val)+ r.Sp = uint64(val) case 8: r.R8 = uint64(val) case 9:@@ -162,9 +162,9 @@ case 15: r.R15 = uint64(val) case 16:- r.Rip = uint64(val)+ r.Ip = uint64(val) case 17:- r.Eflags = uint64(val)+ r.Flags = uint64(val) case 18: r.Cs = uint64(val) case 19:Index: libgo/mksysinfo.sh===================================================================--- libgo/mksysinfo.sh (revision 154106)+++ libgo/mksysinfo.sh (working copy)@@ -49,7 +49,7 @@ #include <linux/user.h> EOF -${CC} -D_GNU_SOURCE -ggo -S -o sysinfo.s sysinfo.c+${CC} ${CFLAGS} -D_GNU_SOURCE -ggo -S -o sysinfo.s sysinfo.c echo 'package syscall' > ${OUT} Index: libgo/syscalls/syscall_linux_amd64.go===================================================================--- libgo/syscalls/syscall_linux_amd64.go (revision 154106)+++ libgo/syscalls/syscall_linux_amd64.go (working copy)@@ -7,9 +7,9 @@ package syscall func (r *PtraceRegs) PC() uint64 {- return r.Rip;+ return r.Ip; } func (r *PtraceRegs) SetPC(pc uint64) {- r.Rip = pc;+ r.Ip = pc; }