From 2f619eed946635074be15ddca9311c1e78ebd8c9 Mon Sep 17 00:00:00 2001
From: Pete Williamson <address@hidden>
Date: Fri, 27 Mar 2015 17:24:23 -0700
Subject: [PATCH] Add NaCl to the list of supported OSs

This is the first part of adding support for the NativeClient (NaCl)
build system to port emacs to NaCl.  NaCl is a way to build native code
binaries to run as apps or in tabs in the chromium browser.

This is a part of an ongoing port to NaCl.  See
https://code.google.com/p/naclports/source/browse/trunk/src/ports/emacs/nacl.patch?spec=svn1621&r=1621
---
 ChangeLog    |  5 +++++
 configure.ac | 14 ++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a489ab9..d839b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03027 Pete Williamson <address@hidden>
+
+	* configure.ac: Add a new supported target, Chromium Native Client
+	(NaCl).
+
 2015-03-23  Andreas Schwab  <address@hidden>
 
 	* configure.ac: Fix jpeg version check to work with gcc >= 5.
diff --git a/configure.ac b/configure.ac
index bed94fb..4676fdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,6 +690,11 @@ case "${canonical}" in
     esac
   ;;
 
+  ## Chromium Native Client
+  *-nacl  )
+    opsys=nacl
+  ;;
+
   ## Intel 386 machines where we don't care about the manufacturer.
   i[3456]86-*-* )
     case "${canonical}" in
@@ -1263,6 +1268,7 @@ dnl The function dump-emacs will not be defined and temacs will do
 dnl (load "loadup") automatically unless told otherwise.
 test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no
 case "$opsys" in
+  nacl) CANNOT_DUMP=yes ;;
   your-opsys-here) CANNOT_DUMP=yes ;;
 esac
 
@@ -2104,7 +2110,7 @@ hybrid_malloc=
 
 case "$opsys" in
   ## darwin ld insists on the use of malloc routines in the System framework.
-  darwin|mingw32|sol2-10) system_malloc=yes ;;
+  darwin|mingw32|sol2-10|nacl) system_malloc=yes ;;
   cygwin) hybrid_malloc=yes;;
 esac
 
@@ -4186,7 +4192,7 @@ emacs_broken_SIGIO=no
 case $opsys in
   dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
   dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
-  hpux* | irix6-5 | openbsd | sol2* | unixware )
+  hpux* | irix6-5 | openbsd | sol2* | unixware | nacl )
     emacs_broken_SIGIO=yes
     ;;
 
@@ -4348,7 +4354,7 @@ case $opsys in
     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
     ;;
 
-  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
+  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | nacl )
     dnl if HAVE_GRANTPT
     if test "x$ac_cv_func_grantpt" = xyes; then
       AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
@@ -4647,7 +4653,7 @@ esac
 
 AC_CACHE_CHECK([for usable FIONREAD], [emacs_cv_usable_FIONREAD],
   [case $opsys in
-     aix4-2)
+     aix4-2 | nacl)
        dnl BUILD 9008 - FIONREAD problem still exists in X-Windows.
        emacs_cv_usable_FIONREAD=no
        ;;
-- 
2.2.0.rc0.207.ga3a616c