Non-SFI Mode: Build libevent with PNaCl toolchain for nacl_helper_nonsfi.

third_party/libevent/nacl_nonsfi/event-config.h

Index: third_party/libevent/nacl_nonsfi/event-config.h
diff --git a/third_party/libevent/linux/event-config.h b/third_party/libevent/nacl_nonsfi/event-config.h
similarity index 90%
copy from third_party/libevent/linux/event-config.h
copy to third_party/libevent/nacl_nonsfi/event-config.h
index c8a643195f33ae11a2e1f1aa56e8420920e2525e..6ade32a5c5caa3e6f4153e990f0fe75c9c359569 100644
--- a/third_party/libevent/linux/event-config.h
+++ b/third_party/libevent/nacl_nonsfi/event-config.h
@@ -1,12 +1,11 @@
-/* event-config.h
- * Generated by autoconf; post-processed by libevent.
- * Do not edit this file.
- * Do not rely on macros in this file existing in later versions.
+/* Copied from Linux version and changed the features according the PNaCl
+ * toolchain for the Non-SFI binary build, which is close to one under the
+ * linux/ directory. The built binary will be running under Linux directly,
+ * actually.
  */
+
 #ifndef _EVENT_CONFIG_H_
 #define _EVENT_CONFIG_H_
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define if clock_gettime is available in libc */
 #define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1
@@ -24,10 +23,10 @@
 #define _EVENT_HAVE_DLFCN_H 1
 
 /* Define if your system supports the epoll system calls */
-#define _EVENT_HAVE_EPOLL 1
+/* #undef _EVENT_HAVE_EPOLL */
 
 /* Define to 1 if you have the `epoll_ctl' function. */
-#define _EVENT_HAVE_EPOLL_CTL 1
+/* #undef _EVENT_HAVE_EPOLL_CTL */
 
 /* Define if your system supports event ports */
 /* #undef _EVENT_HAVE_EVENT_PORTS */
@@ -99,13 +98,13 @@
 /* #undef _EVENT_HAVE_PORT_H */
 
 /* Define to 1 if you have the `select' function. */
-#define _EVENT_HAVE_SELECT 1
+/* #undef _EVENT_HAVE_SELECT */
 
 /* Define if F_SETFD is defined in <fcntl.h> */
 #define _EVENT_HAVE_SETFD 1
 
 /* Define to 1 if you have the `sigaction' function. */
-#define _EVENT_HAVE_SIGACTION 1
+/* #undef _EVENT_HAVE_SIGACTION */
 
 /* Define to 1 if you have the `signal' function. */
 #define _EVENT_HAVE_SIGNAL 1
@@ -147,13 +146,13 @@
 /* #undef _EVENT_HAVE_SYS_DEVPOLL_H */
 
 /* Define to 1 if you have the <sys/epoll.h> header file. */
-#define _EVENT_HAVE_SYS_EPOLL_H 1
+/* #undef _EVENT_HAVE_SYS_EPOLL_H */
 
 /* Define to 1 if you have the <sys/event.h> header file. */
 /* #undef _EVENT_HAVE_SYS_EVENT_H */
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define _EVENT_HAVE_SYS_IOCTL_H 1
+/* #undef _EVENT_HAVE_SYS_IOCTL_H */
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define _EVENT_HAVE_SYS_PARAM_H 1
@@ -180,16 +179,16 @@
 #define _EVENT_HAVE_TAILQFOREACH 1
 
 /* Define if timeradd is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERADD 1
+/* #undef _EVENT_HAVE_TIMERADD */
 
 /* Define if timerclear is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERCLEAR 1
+/* #undef _EVENT_HAVE_TIMERCLEAR */
 
 /* Define if timercmp is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERCMP 1
+/* #undef _EVENT_HAVE_TIMERCMP */
 
 /* Define if timerisset is defined in <sys/time.h> */
-#define _EVENT_HAVE_TIMERISSET 1
+/* #undef _EVENT_HAVE_TIMERISSET */
 
 /* Define to 1 if the system has the type `uint16_t'. */
 #define _EVENT_HAVE_UINT16_T 1
@@ -213,7 +212,7 @@
 /* #undef _EVENT_HAVE_WORKING_KQUEUE */
 
 /* Name of package */
-#define _EVENT_PACKAGE "libevent"
+#define _EVENT_PACKAGE "libevent_nacl"
 
 /* Define to the address where bug reports for this package should be sent. */
 #define _EVENT_PACKAGE_BUGREPORT ""
@@ -271,4 +270,11 @@
 
 /* Define to unsigned int if you dont have it */
 /* #undef _EVENT_socklen_t */
+
+/* Work around for __native_client_nonsfi__ build. random() is not provided
+ * by the newlib-based PNaCl toolchain, so here we declare it. Please see also
+ * nacl_nonsfi/random.c for more details.
+ */
+int random();

[Mark Seaborn, 2014/10/14 15:48:00]

The man page says the return type is "long int".

[hidehiko, 2014/10/14 16:53:25]

Good catch. Fixed.

+
 #endif