Tweaks to fix builds.

diff --git a/sysdeps/arm/nacl/sysdep.h b/sysdeps/arm/nacl/sysdep.h
index 951df3215d1150d3c8abcdbd7e96e1bc2adc52e1..aeb5566dde72824930d4803429f6aba1b63b54e3 100644 (file)
--- 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 693cd4cf312687d51cd373be0cf39f525948a49e..7a26b7f50d608aabbf7319b05bd3e978ccdb3897 100644 (file)
--- 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 6e9060a9ec9831a67e288d287dfcce8104f6e731..6bc753be0377dc279b4f8e755dc678908907fe4b 100644 (file)
--- 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