commit fc42060bff9816ce829632523b1f1134f72c692d
author Ben Chan <benchan@chromium.org> Tue Apr 01 14:00:36 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 04 04:58:52 2014 +0000
tree a37eb03ef9d7d6ea71c93351e83ea8517db9ff6c
parent 25db693282946028b68d8b3fe39bca765d72f5e9

minijail: Fix issues when compiling for mipsel-o32.

BUG=chromium:358432
TEST=Tested the following:
1. Verify that syslog() uses 'connect' and 'send' syscalls as follows:

    echo 'main() { syslog(0, "test"); }' \
      | mipsel-cros-linux-gnu-gcc -static -o main -xc -
    qemu-mipsel -strace main

2. `emerge-mipsel-o32-geneirc chromeos-minijail`
3. `FEATURES=test emerge-{x86,amd64,arm}-geneirc chromeos-minijail`

Change-Id: I5084f1b8c19d2173bf133fa44210f0637f1d0cc4
Reviewed-on: https://chromium-review.googlesource.com/192603
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

signal.c

diff --git a/signal.c b/signal.c
index 85103c7..7342e04 100644
--- a/signal.c
+++ b/signal.c
@@ -3,15 +3,18 @@
  * found in the LICENSE file.
  */
 
+/* These header files need to be included before asm/siginfo.h such that
+ * pid_t, timer_t, and clock_t are defined. */
+#include <stdlib.h>
+#include <unistd.h>
+
 #include <asm/siginfo.h>
 #define __have_siginfo_t 1
 #define __have_sigval_t 1
 #define __have_sigevent_t 1
 
 #include <signal.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "signal.h"
 

util.c

diff --git a/util.c b/util.c
index 3d5a3c2..680d8f1 100644
--- a/util.c
+++ b/util.c
@@ -30,7 +30,7 @@
 #elif defined(__arm__)
 const char *log_syscalls[] = { "connect", "gettimeofday", "send" };
 #elif defined(__powerpc__) || defined(__ia64__) || defined(__hppa__) || \
-      defined(__sparc__)
+      defined(__sparc__) || defined(__mips__)
 const char *log_syscalls[] = { "connect", "send" };
 #else
 #error "Unsupported platform"