From aaf38f77736da87e6e453f63a6106fc59080b7a5 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 12 Feb 2015 14:36:23 -0800
Subject: [PATCH] Tweaks to fix builds.

---
 sysdeps/arm/nacl/sysdep.h | 1 +
 sysdeps/nacl/Makefile     | 2 ++
 sysdeps/nacl/configure    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sysdeps/arm/nacl/sysdep.h b/sysdeps/arm/nacl/sysdep.h
index 951df3215d1..aeb5566dde7 100644
--- a/sysdeps/arm/nacl/sysdep.h
+++ b/sysdeps/arm/nacl/sysdep.h
@@ -60,6 +60,7 @@
 /* Rather than macroizing the code any more, we can just define a few
    mnemonics as macros here.  */
 # define bl			sfi_bl
+# define bxne			sfi_blne /* Only condition now in use.  */
 # define bx			sfi_bx
 # define blx			sfi_blx
 # define bxeq			sfi_bxeq /* Only condition now in use.  */
diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 693cd4cf312..7a26b7f50d6 100644
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -73,6 +73,8 @@ endif
 $(common-objpfx)nacl-interfaces.v.i: $(nacl)/nacl-interfaces.mk.in \
 			      $(nacl)/nacl-interface-list.h
 -include $(common-objpfx)nacl-interfaces.v
+common-generated += nacl-interfaces.v
+before-compile += $(common-objpfx)nacl-interfaces.v
 
 nacl-all-interfaces = $(nacl-mandatory-interfaces) $(nacl-optional-interfaces)
 nacl-interface-routines = $(nacl-all-interfaces:%=nacl-interface-%)
diff --git a/sysdeps/nacl/configure b/sysdeps/nacl/configure
index 6e9060a9ec9..6bc753be037 100644
--- a/sysdeps/nacl/configure
+++ b/sysdeps/nacl/configure
@@ -1,4 +1,4 @@
-# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+# This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/nacl.
 
 nacl_probe_file=native_client/src/trusted/service_runtime/include/sys/errno.h
-- 
2.47.2