--- a/ChangeLog	Fri Sep 20 14:13:18 2013 +0100
+++ b/ChangeLog	Fri Sep 20 14:20:07 2013 +0100
@@ -1,3 +1,25 @@
+2013-09-09  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* acinclude.m4:
+	(IT_SET_ARCH_SETTINGS): Add -D_LITTLE_ENDIAN to arm
+	and support arm64|aarch64.
+	(IT_ENABLE_ZERO_BUILD): Explicitly set ZERO_BITSPERWORD
+	for aarch64, alpha, arm, ia64 && sh.  Replace sparc64 with
+	sparcv9 which is what INSTALL_ARCH_DIR is set to.
+
+2013-08-30  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* INSTALL: Update with --enable-system-kerberos
+	option.
+	* Makefile.am:
+	(ICEDTEA_ENV): Set SYSTEM_KRB5, KRB5_LIBS
+	and KRB5_CFLAGS.
+	* acinclude.m4:
+	(IT_CHECK_FOR_KERBEROS): Add --enable-system-kerberos
+	option (on by default) which checks for libkrb5 and
+	the krb5.h header.
+	* configure.ac: Invoke IT_CHECK_FOR_KERBEROS.
+
 2013-07-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* acinclude.m4:

--- a/INSTALL	Fri Sep 20 14:13:18 2013 +0100
+++ b/INSTALL	Fri Sep 20 14:20:07 2013 +0100
@@ -201,6 +201,9 @@
 * --with-rhino: Include Javascript support using Rhino (location may optionally be specified).
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
+* --enable-system-kerberos: Link against the system Kerberos library and
+  query it at runtime to obtain the cache location, rather than using a
+  hardcoded value.
 
 Testing
 =======

--- a/Makefile.am	Fri Sep 20 14:13:18 2013 +0100
+++ b/Makefile.am	Fri Sep 20 14:20:07 2013 +0100
@@ -586,6 +586,13 @@
 	COMPRESS_JARS="true"
 endif
 
+if USE_SYSTEM_KERBEROS
+ICEDTEA_ENV += \
+	SYSTEM_KRB5="true" \
+	KRB5_LIBS="${KRB5_LIBS}" \
+	KRB5_CFLAGS="${KRB5_CFLAGS}"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \

--- a/acinclude.m4	Fri Sep 20 14:13:18 2013 +0100
+++ b/acinclude.m4	Fri Sep 20 14:20:07 2013 +0100
@@ -23,6 +23,13 @@
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
       JRE_ARCH_DIR=arm
+      ARCHFLAG="-D_LITTLE_ENDIAN"
+      ;;
+    arm64|aarch64)
+      BUILD_ARCH_DIR=aarch64
+      INSTALL_ARCH_DIR=aarch64
+      JRE_ARCH_DIR=aarch64
+      ARCHFLAG="-D_LITTLE_ENDIAN"
       ;;
     mips)
       BUILD_ARCH_DIR=mips
@@ -695,10 +702,10 @@
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in
-    i386|ppc|s390|sparc)
+    arm|i386|ppc|s390|sh|sparc)
       ZERO_BITSPERWORD=32
       ;;
-    amd64|ppc64|s390x|sparc64)
+    aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
       ZERO_BITSPERWORD=64
       ;;
     *)
@@ -2061,6 +2068,32 @@
   AC_SUBST(ENABLE_SYSTEM_GIF)
 ])
 
+dnl Check for Kerberos library in order to lookup cache location at runtime.
+AC_DEFUN_ONCE([IT_CHECK_FOR_KERBEROS],
+[
+  AC_MSG_CHECKING([whether to use the system Kerberos install])
+  AC_ARG_ENABLE([system-kerberos],
+	      [AS_HELP_STRING(--enable-system-kerberos,use the system kerberos [[default=yes]])],
+  [
+    ENABLE_SYSTEM_KERBEROS="${enableval}"
+  ],
+  [
+    ENABLE_SYSTEM_KERBEROS="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_SYSTEM_KERBEROS})
+  if test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes"; then
+    dnl Check for krb5 header and library.
+    AC_CHECK_LIB([krb5], [krb5_cc_default],
+        , [AC_MSG_ERROR([Could not find Kerberos library; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+    AC_CHECK_HEADER([krb5.h],
+        , [AC_MSG_ERROR([Could not find Kerberos header; install Kerberos or build with --disable-system-kerberos to use the default cache location.])])
+    KRB5_LIBS="-lkrb5"
+    AC_SUBST(KRB5_LIBS)
+  fi
+  AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
+  AC_SUBST(ENABLE_SYSTEM_KERBEROS)
+])
+
 AC_DEFUN_ONCE([IT_CHECK_FOR_GTK],
 [
   AC_MSG_CHECKING([whether to use the system Gtk+ install])

--- a/configure.ac	Fri Sep 20 14:13:18 2013 +0100
+++ b/configure.ac	Fri Sep 20 14:20:07 2013 +0100
@@ -198,6 +198,8 @@
 AC_PATH_TOOL([GCJ],[gcj])
 AC_SUBST([GCJ])
 
+IT_CHECK_FOR_KERBEROS
+
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([X11/X.h],[]
 	,[AC_MSG_ERROR("xorg headers were not found -