runtime, syscall: fix freebsd-386 build

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

diff --git a/src/pkg/runtime/signal_freebsd_386.c b/src/pkg/runtime/signal_freebsd_386.c
index c6eb34436117168557ef3d5db89d377cd82724b3..b07ead62e8d7e91b9fed912e75259ec0ea939f64 100644 (file)
--- a/src/pkg/runtime/signal_freebsd_386.c
+++ b/src/pkg/runtime/signal_freebsd_386.c
@@ -36,14 +36,6 @@ runtime·dumpregs(Mcontext *r)
        runtime·printf("gs      %x\n", r->mc_gs);
 }
 
-String
-runtime·signame(int32 sig)
-{
-       if(sig < 0 || sig >= NSIG)
-               return runtime·emptystring;
-       return runtime·gostringnocopy((byte*)runtime·sigtab[sig].name);
-}
-
 void
 runtime·sighandler(int32 sig, Siginfo *info, void *context, G *gp)
 {

diff --git a/src/pkg/syscall/zerrors_freebsd_386.go b/src/pkg/syscall/zerrors_freebsd_386.go
index 83243d0968df45949cca947c0b76655b69244e9f..cc00f0dcfea24967a60b05a717c72a150918a6a1 100644 (file)
--- a/src/pkg/syscall/zerrors_freebsd_386.go
+++ b/src/pkg/syscall/zerrors_freebsd_386.go
@@ -887,6 +887,29 @@ const (
        NET_RT_IFLIST                     = 0x3
        NET_RT_IFMALIST                   = 0x4
        NET_RT_MAXID                      = 0x5
+       NOTE_ATTRIB                       = 0x8
+       NOTE_CHILD                        = 0x4
+       NOTE_DELETE                       = 0x1
+       NOTE_EXEC                         = 0x20000000
+       NOTE_EXIT                         = 0x80000000
+       NOTE_EXTEND                       = 0x4
+       NOTE_FFAND                        = 0x40000000
+       NOTE_FFCOPY                       = 0xc0000000
+       NOTE_FFCTRLMASK                   = 0xc0000000
+       NOTE_FFLAGSMASK                   = 0xffffff
+       NOTE_FFNOP                        = 0x0
+       NOTE_FFOR                         = 0x80000000
+       NOTE_FORK                         = 0x40000000
+       NOTE_LINK                         = 0x10
+       NOTE_LOWAT                        = 0x1
+       NOTE_PCTRLMASK                    = 0xf0000000
+       NOTE_PDATAMASK                    = 0xfffff
+       NOTE_RENAME                       = 0x20
+       NOTE_REVOKE                       = 0x40
+       NOTE_TRACK                        = 0x1
+       NOTE_TRACKERR                     = 0x2
+       NOTE_TRIGGER                      = 0x1000000
+       NOTE_WRITE                        = 0x2
        O_ACCMODE                         = 0x3
        O_APPEND                          = 0x8
        O_ASYNC                           = 0x40
@@ -995,40 +1018,6 @@ const (
        SHUT_RD                           = 0x0
        SHUT_RDWR                         = 0x2
        SHUT_WR                           = 0x1
-       SIGABRT                           = 0x6
-       SIGALRM                           = 0xe
-       SIGBUS                            = 0xa
-       SIGCHLD                           = 0x14
-       SIGCONT                           = 0x13
-       SIGEMT                            = 0x7
-       SIGFPE                            = 0x8
-       SIGHUP                            = 0x1
-       SIGILL                            = 0x4
-       SIGINFO                           = 0x1d
-       SIGINT                            = 0x2
-       SIGIO                             = 0x17
-       SIGIOT                            = 0x6
-       SIGKILL                           = 0x9
-       SIGLWP                            = 0x20
-       SIGPIPE                           = 0xd
-       SIGPROF                           = 0x1b
-       SIGQUIT                           = 0x3
-       SIGSEGV                           = 0xb
-       SIGSTOP                           = 0x11
-       SIGSYS                            = 0xc
-       SIGTERM                           = 0xf
-       SIGTHR                            = 0x20
-       SIGTRAP                           = 0x5
-       SIGTSTP                           = 0x12
-       SIGTTIN                           = 0x15
-       SIGTTOU                           = 0x16
-       SIGURG                            = 0x10
-       SIGUSR1                           = 0x1e
-       SIGUSR2                           = 0x1f
-       SIGVTALRM                         = 0x1a
-       SIGWINCH                          = 0x1c
-       SIGXCPU                           = 0x18
-       SIGXFSZ                           = 0x19
        SIOCADDMULTI                      = 0x80206931
        SIOCADDRT                         = 0x8030720a
        SIOCAIFADDR                       = 0x8040691a
@@ -1323,6 +1312,44 @@ const (
        EXDEV           = Errno(0x12)
 )
 
+// Signals
+const (
+       SIGABRT   = Signal(0x6)
+       SIGALRM   = Signal(0xe)
+       SIGBUS    = Signal(0xa)
+       SIGCHLD   = Signal(0x14)
+       SIGCONT   = Signal(0x13)
+       SIGEMT    = Signal(0x7)
+       SIGFPE    = Signal(0x8)
+       SIGHUP    = Signal(0x1)
+       SIGILL    = Signal(0x4)
+       SIGINFO   = Signal(0x1d)
+       SIGINT    = Signal(0x2)
+       SIGIO     = Signal(0x17)
+       SIGIOT    = Signal(0x6)
+       SIGKILL   = Signal(0x9)
+       SIGLWP    = Signal(0x20)
+       SIGPIPE   = Signal(0xd)
+       SIGPROF   = Signal(0x1b)
+       SIGQUIT   = Signal(0x3)
+       SIGSEGV   = Signal(0xb)
+       SIGSTOP   = Signal(0x11)
+       SIGSYS    = Signal(0xc)
+       SIGTERM   = Signal(0xf)
+       SIGTHR    = Signal(0x20)
+       SIGTRAP   = Signal(0x5)
+       SIGTSTP   = Signal(0x12)
+       SIGTTIN   = Signal(0x15)
+       SIGTTOU   = Signal(0x16)
+       SIGURG    = Signal(0x10)
+       SIGUSR1   = Signal(0x1e)
+       SIGUSR2   = Signal(0x1f)
+       SIGVTALRM = Signal(0x1a)
+       SIGWINCH  = Signal(0x1c)
+       SIGXCPU   = Signal(0x18)
+       SIGXFSZ   = Signal(0x19)
+)
+
 // Error table
 var errors = [...]string{
        1:  "operation not permitted",
@@ -1419,3 +1446,39 @@ var errors = [...]string{
        92: "protocol error",
        93: "capabilities insufficient",
 }
+
+// Signal table
+var signals = [...]string{
+       1:  "hangup",
+       2:  "interrupt",
+       3:  "quit",
+       4:  "illegal instruction",
+       5:  "trace/BPT trap",
+       6:  "abort trap",
+       7:  "EMT trap",
+       8:  "floating point exception",
+       9:  "killed",
+       10: "bus error",
+       11: "segmentation fault",
+       12: "bad system call",
+       13: "broken pipe",
+       14: "alarm clock",
+       15: "terminated",
+       16: "urgent I/O condition",
+       17: "suspended (signal)",
+       18: "suspended",
+       19: "continued",
+       20: "child exited",
+       21: "stopped (tty input)",
+       22: "stopped (tty output)",
+       23: "I/O possible",
+       24: "cputime limit exceeded",
+       25: "filesize limit exceeded",
+       26: "virtual timer expired",
+       27: "profiling timer expired",
+       28: "window size changes",
+       29: "information request",
+       30: "user defined signal 1",
+       31: "user defined signal 2",
+       32: "unknown signal",
+}