From 115a1379ebf72f2090a656649ba8c791ffb47ce4 Mon Sep 17 00:00:00 2001 From: Michael Tüxen Date: Fri, 30 Nov 2018 16:13:30 +0100 Subject: FreeBSD: Fix make extract * FreeBSD: Fix make extract. A header was missing... * FreeBSD: Fix make extract Changes in generated files. --- executor/defs.h | 2 +- sys/freebsd/gen/amd64.go | 4 +++- sys/freebsd/socket.txt | 1 + sys/freebsd/socket_amd64.const | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/executor/defs.h b/executor/defs.h index a4e90c930..6f45b8a6f 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -20,7 +20,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "b8fc36a63d4105cc2a16b4671864f7a5adddadaa" +#define SYZ_REVISION "fe257e9b1cf5311f7b1627e649739577c6308e26" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/sys/freebsd/gen/amd64.go b/sys/freebsd/gen/amd64.go index 00f4e45ca..6ae801eaf 100644 --- a/sys/freebsd/gen/amd64.go +++ b/sys/freebsd/gen/amd64.go @@ -2082,7 +2082,9 @@ var consts_amd64 = []ConstValue{ {Name: "LINUX_RLIMIT_STACK", Value: 3}, {Name: "LINUX_SCM_CREDENTIALS", Value: 2}, {Name: "LINUX_SCM_RIGHTS", Value: 1}, + {Name: "LINUX_SOCK_CLOEXEC", Value: 524288}, {Name: "LINUX_SOCK_DGRAM", Value: 2}, + {Name: "LINUX_SOCK_NONBLOCK", Value: 2048}, {Name: "LINUX_SOCK_RAW", Value: 3}, {Name: "LINUX_SOCK_RDM", Value: 4}, {Name: "LINUX_SOCK_SEQPACKET", Value: 5}, @@ -2412,4 +2414,4 @@ var consts_amd64 = []ConstValue{ {Name: "WUNTRACED", Value: 2}, } -const revision_amd64 = "b8fc36a63d4105cc2a16b4671864f7a5adddadaa" +const revision_amd64 = "fe257e9b1cf5311f7b1627e649739577c6308e26" diff --git a/sys/freebsd/socket.txt b/sys/freebsd/socket.txt index 3b7c7822b..6fee81437 100644 --- a/sys/freebsd/socket.txt +++ b/sys/freebsd/socket.txt @@ -8,6 +8,7 @@ include include include include +include include resource sock[fd] diff --git a/sys/freebsd/socket_amd64.const b/sys/freebsd/socket_amd64.const index 397da6358..d19b81705 100644 --- a/sys/freebsd/socket_amd64.const +++ b/sys/freebsd/socket_amd64.const @@ -21,7 +21,9 @@ LINUX_MSG_PEEK = 2 LINUX_MSG_TRUNC = 32 LINUX_MSG_WAITALL = 256 LINUX_MSG_WAITFORONE = 65536 +LINUX_SOCK_CLOEXEC = 524288 LINUX_SOCK_DGRAM = 2 +LINUX_SOCK_NONBLOCK = 2048 LINUX_SOCK_RAW = 3 LINUX_SOCK_RDM = 4 LINUX_SOCK_SEQPACKET = 5 -- cgit mrf-deployment