runtime: regenerate defs_darwin_{386,amd64}.h

Regenerated under Lion 10.7.2 amd64.
Also tested on Snow Leopart 10.6.8 386.

R=golang-dev, dsymonds, minux.ma
CC=golang-dev
https://golang.org/cl/5533058

diff --git a/src/pkg/runtime/defs_darwin.go b/src/pkg/runtime/defs_darwin.go
index 3f3e41d86b1e70276a3371acb692671b927dc85c..80b7a4f27798eb6afb532557f0639ba178edca35 100644 (file)
--- a/src/pkg/runtime/defs_darwin.go
+++ b/src/pkg/runtime/defs_darwin.go
@@ -7,8 +7,8 @@
 /*
 Input to cgo.
 
-GOARCH=amd64 cgo -cdefs defs.go >amd64/defs.h
-GOARCH=386 cgo -cdefs defs.go >386/defs.h
+GOARCH=amd64 cgo -cdefs defs_darwin.go >defs_darwin_amd64.h
+GOARCH=386 cgo -cdefs defs_darwin.go >defs_darwin_386.h
 */
 
 package runtime
@@ -55,7 +55,6 @@ const (
 
        MACH_SEND_TIMEOUT   = C.MACH_SEND_TIMEOUT
        MACH_SEND_INTERRUPT = C.MACH_SEND_INTERRUPT
-       MACH_SEND_CANCEL    = C.MACH_SEND_CANCEL
        MACH_SEND_ALWAYS    = C.MACH_SEND_ALWAYS
        MACH_SEND_TRAILER   = C.MACH_SEND_TRAILER
        MACH_RCV_TIMEOUT    = C.MACH_RCV_TIMEOUT

diff --git a/src/pkg/runtime/defs_darwin_386.h b/src/pkg/runtime/defs_darwin_386.h
index 6d1863ce20cf26dcbc7b524a355d3394b1f07473..3606bad9413200f5eee3c4fb556f66a98101054e 100644 (file)
--- a/src/pkg/runtime/defs_darwin_386.h
+++ b/src/pkg/runtime/defs_darwin_386.h
@@ -1,5 +1,5 @@
 // Created by cgo -cdefs - DO NOT EDIT
-// cgo -cdefs defs.go
+// cgo -cdefs defs_darwin.go
 
 
 enum {
@@ -33,7 +33,6 @@ enum {
 
        MACH_SEND_TIMEOUT       = 0x10,
        MACH_SEND_INTERRUPT     = 0x40,
-       MACH_SEND_CANCEL        = 0x80,
        MACH_SEND_ALWAYS        = 0x10000,
        MACH_SEND_TRAILER       = 0x20000,
        MACH_RCV_TIMEOUT        = 0x100,
@@ -197,10 +196,10 @@ struct Itimerval {
 };
 
 struct FPControl {
-       byte    Pad_godefs_0[2];
+       byte    Pad_cgo_0[2];
 };
 struct FPStatus {
-       byte    Pad_godefs_0[2];
+       byte    Pad_cgo_0[2];
 };
 struct RegMMST {
        int8    mmst_reg[10];
@@ -276,7 +275,8 @@ struct FloatState64 {
        int32   fpu_reserved1;
 };
 struct ExceptionState64 {
-       uint32  trapno;
+       uint16  trapno;
+       uint16  cpu;
        uint32  err;
        uint64  faultvaddr;
 };
@@ -339,7 +339,8 @@ struct FloatState32 {
        int32   fpu_reserved1;
 };
 struct ExceptionState32 {
-       uint32  trapno;
+       uint16  trapno;
+       uint16  cpu;
        uint32  err;
        uint32  faultvaddr;
 };

diff --git a/src/pkg/runtime/defs_darwin_amd64.h b/src/pkg/runtime/defs_darwin_amd64.h
index a8493e4a44aa224bc35d9529d7a2016ee8a5fa4b..c28225f4cfe5a53cb03f1f597e2425b133689744 100644 (file)
--- a/src/pkg/runtime/defs_darwin_amd64.h
+++ b/src/pkg/runtime/defs_darwin_amd64.h
@@ -1,5 +1,5 @@
 // Created by cgo -cdefs - DO NOT EDIT
-// cgo -cdefs defs.go
+// cgo -cdefs defs_darwin.go
 
 
 enum {
@@ -33,7 +33,6 @@ enum {
 
        MACH_SEND_TIMEOUT       = 0x10,
        MACH_SEND_INTERRUPT     = 0x40,
-       MACH_SEND_CANCEL        = 0x80,
        MACH_SEND_ALWAYS        = 0x10000,
        MACH_SEND_TRAILER       = 0x20000,
        MACH_RCV_TIMEOUT        = 0x100,
@@ -164,7 +163,7 @@ struct StackT {
        byte    *ss_sp;
        uint64  ss_size;
        int32   ss_flags;
-       byte    Pad_godefs_0[4];
+       byte    Pad_cgo_0[4];
 };
 typedef        byte    Sighandler[8];
 
@@ -191,7 +190,7 @@ struct Siginfo {
 struct Timeval {
        int64   tv_sec;
        int32   tv_usec;
-       byte    Pad_godefs_0[4];
+       byte    Pad_cgo_0[4];
 };
 struct Itimerval {
        Timeval it_interval;
@@ -199,10 +198,10 @@ struct Itimerval {
 };
 
 struct FPControl {
-       byte    Pad_godefs_0[2];
+       byte    Pad_cgo_0[2];
 };
 struct FPStatus {
-       byte    Pad_godefs_0[2];
+       byte    Pad_cgo_0[2];
 };
 struct RegMMST {
        int8    mmst_reg[10];
@@ -278,7 +277,8 @@ struct FloatState64 {
        int32   fpu_reserved1;
 };
 struct ExceptionState64 {
-       uint32  trapno;
+       uint16  trapno;
+       uint16  cpu;
        uint32  err;
        uint64  faultvaddr;
 };
@@ -286,7 +286,7 @@ struct Mcontext64 {
        ExceptionState64        es;
        Regs64  ss;
        FloatState64    fs;
-       byte    Pad_godefs_0[4];
+       byte    Pad_cgo_0[4];
 };
 
 struct Regs32 {
@@ -342,7 +342,8 @@ struct FloatState32 {
        int32   fpu_reserved1;
 };
 struct ExceptionState32 {
-       uint32  trapno;
+       uint16  trapno;
+       uint16  cpu;
        uint32  err;
        uint32  faultvaddr;
 };