Sync in latest upstream system call definitions.

Futex object scopes have been renamed from using their own constants to
simply reusing the existing CLOUDABI_MAP_{PRIVATE,SHARED} flags, as they
are more accurate in this context.

2 files changed, 3 insertions, 8 deletions

diff --git a/sys/contrib/cloudabi/syscalldefs_md.h b/sys/contrib/cloudabi/syscalldefs_md.h
index 272360e..a7045c2 100644
--- a/sys/contrib/cloudabi/syscalldefs_md.h
+++ b/sys/contrib/cloudabi/syscalldefs_md.h
@@ -193,8 +193,8 @@ typedef struct {
     struct {
       MEMBER(PTR(_Atomic(cloudabi_condvar_t))) condvar;
       MEMBER(PTR(_Atomic(cloudabi_lock_t))) lock;
-      MEMBER(cloudabi_futexscope_t) condvar_scope;
-      MEMBER(cloudabi_futexscope_t) lock_scope;
+      MEMBER(cloudabi_mflags_t) condvar_scope;
+      MEMBER(cloudabi_mflags_t) lock_scope;
     } condvar;
 
     // CLOUDABI_EVENTTYPE_FD_READ and CLOUDABI_EVENTTYPE_FD_WRITE:
@@ -208,7 +208,7 @@ typedef struct {
     // and acquire a read or write lock.
     struct {
       MEMBER(PTR(_Atomic(cloudabi_lock_t))) lock;
-      MEMBER(cloudabi_futexscope_t) lock_scope;
+      MEMBER(cloudabi_mflags_t) lock_scope;
     } lock;
 
     // CLOUDABI_EVENTTYPE_PROC_TERMINATE: Wait for a process to terminate.
diff --git a/sys/contrib/cloudabi/syscalldefs_mi.h b/sys/contrib/cloudabi/syscalldefs_mi.h
index 23aa58c..151a3dc 100644
--- a/sys/contrib/cloudabi/syscalldefs_mi.h
+++ b/sys/contrib/cloudabi/syscalldefs_mi.h
@@ -189,10 +189,6 @@
 #define CLOUDABI_FILETYPE_SOCKET_STREAM 0x82
 #define CLOUDABI_FILETYPE_SYMBOLIC_LINK 0x90
 
-// Futex object scopes.
-#define CLOUDABI_FUTEXSCOPE_GLOBAL 1
-#define CLOUDABI_FUTEXSCOPE_PROCESS_LOCAL 2
-
 // Read-write lock related constants.
 #define CLOUDABI_LOCK_UNLOCKED 0                 // Lock is unlocked.
 #define CLOUDABI_LOCK_WRLOCKED 0x40000000        // Lock is write locked.
@@ -354,7 +350,6 @@ typedef int64_t cloudabi_filedelta_t;   // lseek().
 typedef uint64_t cloudabi_filesize_t;   // ftruncate(), struct stat::st_size.
 typedef uint8_t cloudabi_filetype_t;    // struct stat::st_mode.
 typedef uint16_t cloudabi_fsflags_t;    // file_stat_put().
-typedef uint8_t cloudabi_futexscope_t;  // Scope of lock or condition variable.
 typedef uint64_t cloudabi_inode_t;      // struct stat::st_ino.
 typedef uint32_t cloudabi_linkcount_t;  // struct stat::st_nlink.
 typedef uint32_t cloudabi_lock_t;       // pthread_{mutex,rwlock}_*().