Fix build on Android (jart#108)

* configure: Check for functions missing on bionic This includes: - pthread_setcancelstate - sockatmark See termux/proot-distro#281.
tintupratap · Apr 20, 2023 · 8b17fed · 8b17fed
1 parent bf7393b
commit 8b17fed
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 8 deletions.
diff --git a/blink/demangle.c b/blink/demangle.c
@@ -236,7 +236,9 @@ char *Demangle(char *p, const char *symbol, size_t n) {
   sigset_t ss, oldss;
   sn = strlen(symbol);
   if (startswith(symbol, "_Z")) {
+#ifdef HAVE_PTHREAD_SETCANCELSTATE
     unassert(!pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs));
+#endif
     unassert(!pthread_once_(&g_cxxfilt.once, InitCxxFilt));
     LOCK(&g_cxxfilt.lock);
     if (g_cxxfilt.pid != -1) {
@@ -261,7 +263,9 @@ char *Demangle(char *p, const char *symbol, size_t n) {
       r = 0;
     }
     UNLOCK(&g_cxxfilt.lock);
+#ifdef HAVE_PTHREAD_SETCANCELSTATE
     unassert(!pthread_setcancelstate(cs, 0));
+#endif
   } else {
     r = 0;
   }

diff --git a/blink/devfs.c b/blink/devfs.c
@@ -142,7 +142,9 @@ struct VfsSystem g_devfs = {.name = "devfs",
                                     .Tcgetsid = NULL,
                                     .Tcgetpgrp = NULL,
                                     .Tcsetpgrp = NULL,
+#ifdef HAVE_SOCKATMARK
                                     .Sockatmark = NULL,
+#endif
                                     .Fexecve = NULL,
                                 }};
 

diff --git a/blink/errfd.c b/blink/errfd.c
@@ -35,10 +35,14 @@ int WriteErrorString(const char *buf) {
 
 int WriteError(int fd, const char *buf, int len) {
   int rc, cs;
+#ifdef HAVE_PTHREAD_SETCANCELSTATE
   unassert(!pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs));
+#endif
   do rc = write(fd > 0 ? fd : g_errfd, buf, len);
   while (rc == -1 && errno == EINTR);
+#ifdef HAVE_PTHREAD_SETCANCELSTATE
   unassert(!pthread_setcancelstate(cs, 0));
+#endif
   return rc;
 }
 

diff --git a/blink/hostfs.c b/blink/hostfs.c
@@ -1726,6 +1726,7 @@ int HostfsTcsetpgrp(struct VfsInfo *info, pid_t pgrp) {
   return tcsetpgrp(hostinfo->filefd, pgrp);
 }
 
+#ifdef HAVE_SOCKATMARK
 int HostfsSockatmark(struct VfsInfo *info) {
   struct HostfsInfo *hostinfo;
   VFS_LOGF("HostfsSockatmark(%p)", info);
@@ -1735,6 +1736,7 @@ int HostfsSockatmark(struct VfsInfo *info) {
   hostinfo = (struct HostfsInfo *)info->data;
   return sockatmark(hostinfo->filefd);
 }
+#endif
 
 int HostfsPipe(struct VfsInfo *infos[2]) {
   int i;
@@ -2016,7 +2018,9 @@ struct VfsSystem g_hostfs = {.name = "hostfs",
                                  .Tcgetsid = HostfsTcgetsid,
                                  .Tcgetpgrp = HostfsTcgetpgrp,
                                  .Tcsetpgrp = HostfsTcsetpgrp,
+#ifdef HAVE_SOCKATMARK
                                  .Sockatmark = HostfsSockatmark,
+#endif
                                  .Fexecve = HostfsFexecve,
                              }};
 

diff --git a/blink/hostfs.h b/blink/hostfs.h
@@ -113,7 +113,9 @@ int HostfsTcflow(struct VfsInfo *, int);
 pid_t HostfsTcgetsid(struct VfsInfo *);
 pid_t HostfsTcgetpgrp(struct VfsInfo *);
 int HostfsTcsetpgrp(struct VfsInfo *, pid_t);
+#ifdef HAVE_SOCKATMARK
 int HostfsSockatmark(struct VfsInfo *);
+#endif
 int HostfsFexecve(struct VfsInfo *, char *const *, char *const *);
 
 int HostfsWrapFd(int fd, bool dodup, struct VfsInfo **output);

diff --git a/blink/ioctl.c b/blink/ioctl.c
@@ -257,6 +257,7 @@ static int IoctlTcflsh(struct Machine *m, int fildes, int queue) {
   return VfsTcflush(fildes, queue);
 }
 
+#ifdef HAVE_SOCKATMARK
 static int IoctlSiocatmark(struct Machine *m, int fildes, i64 addr) {
   u8 *p;
   int rc;
@@ -267,6 +268,7 @@ static int IoctlSiocatmark(struct Machine *m, int fildes, i64 addr) {
   }
   return rc;
 }
+#endif
 
 static int IoctlGetInt32(struct Machine *m, int fildes, unsigned long cmd,
                          i64 addr) {
@@ -350,10 +352,12 @@ int SysIoctl(struct Machine *m, int fildes, u64 request, i64 addr) {
       return IoctlTiocgsid(m, fildes, addr);
     case TCFLSH_LINUX:
       return IoctlTcflsh(m, fildes, addr);
+#ifdef HAVE_SOCKATMARK
 #ifndef DISABLE_SOCKETS
     case SIOCATMARK_LINUX:
       return IoctlSiocatmark(m, fildes, addr);
 #endif
+#endif
 #ifdef FIONREAD
     case FIONREAD_LINUX:
       return IoctlGetInt32(m, fildes, FIONREAD, addr);

diff --git a/blink/procfs.c b/blink/procfs.c
@@ -52,8 +52,8 @@ struct ProcfsInfo {
   char name[PROCFS_NAME_MAX];
   struct timespec time;
   union {
-    struct ProcfsOpenFile *openfile;
-    struct ProcfsOpenDir *opendir;
+    _Atomic(struct ProcfsOpenFile *)openfile;
+    _Atomic(struct ProcfsOpenDir *)opendir;
   };
   union {
     int (*readdir)(struct VfsInfo *, struct dirent *);
@@ -921,7 +921,6 @@ static int ProcfsOpendir(struct VfsInfo *info, struct VfsInfo **output) {
   return 0;
 }
 
-#ifdef HAVE_SEEKDIR
 static void ProcfsSeekdir(struct VfsInfo *info, long offset) {
   struct ProcfsInfo *procinfo = (struct ProcfsInfo *)info->data;
   if (!S_ISDIR(procinfo->mode) && !procinfo->opendir) {
@@ -931,6 +930,7 @@ static void ProcfsSeekdir(struct VfsInfo *info, long offset) {
   procinfo->opendir->index = offset;
 }
 
+#ifdef HAVE_SEEKDIR
 static long ProcfsTelldir(struct VfsInfo *info) {
   struct ProcfsInfo *procinfo = (struct ProcfsInfo *)info->data;
   if (!S_ISDIR(procinfo->mode) && !procinfo->opendir) {
@@ -958,7 +958,7 @@ static struct dirent *ProcfsReaddir(struct VfsInfo *info) {
 }
 
 static void ProcfsRewinddir(struct VfsInfo *info) {
-  return ProcfsSeekdir(info, 0);
+  ProcfsSeekdir(info, 0);
 }
 
 static int ProcfsClosedir(struct VfsInfo *info) {
@@ -968,12 +968,12 @@ static int ProcfsClosedir(struct VfsInfo *info) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static int ProcfsUtime(struct VfsInfo *, const char *, const struct timespec[2],
-                       int) {
+static int ProcfsUtime(struct VfsInfo *info, const char *name,
+                       const struct timespec times[2], int flags) {
   return einval();
 }
 
-static int ProcfsFutime(struct VfsInfo *, const struct timespec[2]) {
+static int ProcfsFutime(struct VfsInfo *info, const struct timespec times[2]) {
   return einval();
 }
 
@@ -1488,7 +1488,9 @@ struct VfsSystem g_procfs = {.name = "proc",
                                  .Tcgetsid = NULL,
                                  .Tcgetpgrp = NULL,
                                  .Tcsetpgrp = NULL,
+#ifdef HAVE_SOCKATMARK
                                  .Sockatmark = NULL,
+#endif
                                  .Fexecve = NULL,
                              }};
 

diff --git a/blink/vfs.c b/blink/vfs.c
@@ -2782,6 +2782,7 @@ int VfsTcsetpgrp(int fd, pid_t pgrp_id) {
   return ret;
 }
 
+#ifdef HAVE_SOCKATMARK
 int VfsSockatmark(int fd) {
   struct VfsInfo *info;
   int ret;
@@ -2797,6 +2798,7 @@ int VfsSockatmark(int fd) {
   unassert(!VfsFreeInfo(info));
   return ret;
 }
+#endif
 
 int VfsExecve(const char *pathname, char *const *argv, char *const *envp) {
   struct VfsInfo *info;

diff --git a/blink/vfs.h b/blink/vfs.h
@@ -132,7 +132,9 @@ struct VfsOps {
   pid_t (*Tcgetsid)(struct VfsInfo *);
   pid_t (*Tcgetpgrp)(struct VfsInfo *);
   int (*Tcsetpgrp)(struct VfsInfo *, pid_t);
+#ifdef HAVE_SOCKATMARK
   int (*Sockatmark)(struct VfsInfo *);
+#endif
   int (*Fexecve)(struct VfsInfo *, char *const *, char *const *);
 };
 

diff --git a/config.h.in b/config.h.in
@@ -62,5 +62,7 @@
 // #define HAVE_SCHED_GETAFFINITY
 // #define HAVE_PTHREAD_PROCESS_SHARED
 // #define HAVE_SYS_MOUNT_H
+// #define HAVE_PTHREAD_SETCANCELSTATE
+// #define HAVE_SOCKATMARK
 
 #endif /* BLINK_CONFIG_H_ */
diff --git a/configure b/configure
@@ -651,16 +651,18 @@ fi
 ( config memccpy "checking for memccpy()... " uncomment "#define HAVE_MEMCCPY" ) &
 ( config seekdir "checking for seekdir()... " uncomment "#define HAVE_SEEKDIR" ) &
 ( config realpath "checking for realpath()... " uncomment "#define HAVE_REALPATH" ) &
-wait
 ( config setreuid "checking for setreuid()... " uncomment "#define HAVE_SETREUID" ) &
 ( config sendto_zero "checking for sendto(0.0.0.0)... " uncomment "#define HAVE_SENDTO_ZERO" ) &
+wait
 ( config struct_timezone "checking for struct timezone... " uncomment "#define HAVE_STRUCT_TIMEZONE" ) &
 ( config sa_len "checking for sockaddr::sa_len... " uncomment "#define HAVE_SA_LEN" ) &
 ( config map_shared "checking for mmap(MAP_SHARED)... " uncomment "#define HAVE_MAP_SHARED" ) &
 ( config sched_yield "checking for sched_yield()... " uncomment "#define HAVE_SCHED_YIELD" ) &
 ( config clock_settime "checking for clock_settime()... " uncomment "#define HAVE_CLOCK_SETTIME" ) &
 ( config sched_h "checking for sched.h... " uncomment "#define HAVE_SCHED_H" ) &
 ( config pthread_process_shared "checking for PTHREAD_PROCESS_SHARED... " uncomment "#define HAVE_PTHREAD_PROCESS_SHARED" ) &
+( config pthread_setcancelstate "checking for pthread_setcancelstate()... " uncomment "#define HAVE_PTHREAD_SETCANCELSTATE" ) &
+( config sockatmark "checking for sockatmark()... " uncomment "#define HAVE_SOCKATMARK" ) &
 
 wait
 rm -f "${LOCK}"

diff --git a/tool/config/pthread_setcancelstate.c b/tool/config/pthread_setcancelstate.c
@@ -0,0 +1,14 @@
+// checks if pthread_setcancelstate is available and usable
+#include <pthread.h>
+
+void *Worker(void *arg) {
+  return arg;
+}
+
+int main(int argc, char *argv[]) {
+  if (pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0))
+    return 1;
+  if (pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0))
+    return 1;
+  return 0;
+}
diff --git a/tool/config/sockatmark.c b/tool/config/sockatmark.c
@@ -0,0 +1,9 @@
+// checks if sockatmark is available
+#include <sys/socket.h>
+
+int main(int argc, char *argv[]) {
+  int rc;
+  socket(AF_INET, SOCK_STREAM, 0);
+  if (sockatmark(3) == -1) return 1;
+  return 0;
+}