--- a/ChangeLog	Fri Jan 31 21:39:59 2014 +0000
+++ b/ChangeLog	Wed Feb 05 12:19:45 2014 +0000
@@ -1,3 +1,29 @@
+2014-02-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(JDK_CHANGESET): Sync to HEAD.
+	(JDK_SHA256SUM): Likewise.
+	(ICEDTEA_ENV): Use updated SYSTEM_* variables
+	and always set them.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Set ENABLE_SYSTEM_LCMS to true,
+	not yes.
+	(IT_CHECK_FOR_ZLIB): Likewise for ENABLE_SYSTEM_ZLIB.
+	(IT_CHECK_FOR_JPEG): Likewise for ENABLE_SYSTEM_JPEG.
+	(IT_CHECK_FOR_JPEG): Likewise for ENABLE_SYSTEM_JPEG.
+	(IT_CHECK_FOR_PNG): Likewise for ENABLE_SYSTEM_PNG.
+	(IT_CHECK_FOR_GIF): Likewise for ENABLE_SYSTEM_GIF.
+	(IT_CHECK_FOR_KERBEROS): Likewise for ENABLE_SYSTEM_KERBEROS.
+	(IT_CHECK_FOR_GTK): Likewise for ENABLE_SYSTEM_GTK.
+	(IT_CHECK_FOR_GIO): Likewise for ENABLE_SYSTEM_GIO.
+	(IT_CHECK_FOR_FONTCONFIG): Likewise for ENABLE_SYSTEM_FONTCONFIG.
+	(IT_CHECK_FOR_SYSCALLS): Likewise for ENABLE_SYSCALL_COMPILATION.
+	(IT_CHECK_FOR_PCSC): Likewise for ENABLE_SYSTEM_PCSC.
+	(IT_ENABLE_JAR_COMPRESSION): Use standard capitalisation and
+	set to true rather than yes. Call AC_SUBST on ENABLE_JAR_COMPRESSION.
+	* hotspot.map: Sync to HEAD.
+
 2014-01-31  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* patches/boot/jaxp-dependency.patch:

--- a/Makefile.am	Fri Jan 31 21:39:59 2014 +0000
+++ b/Makefile.am	Wed Feb 05 12:19:45 2014 +0000
@@ -7,14 +7,14 @@
 CORBA_CHANGESET = 47343904e95d
 JAXP_CHANGESET = 74093b75ddd4
 JAXWS_CHANGESET = 3f7212cae6eb
-JDK_CHANGESET = 62781eb5cd06
+JDK_CHANGESET = 7d5b758810c2
 LANGTOOLS_CHANGESET = 0d89cc5766d7
 OPENJDK_CHANGESET = ba9872fc05cc
 
 CORBA_SHA256SUM = 78298de3f81eab8c6875f802d76789ad615920a4278f5665eea79045ee0da638
 JAXP_SHA256SUM = 5fc990186c57ed95ad3f9fb4783e874085f1fc624afb81899354c0df04cad73e
 JAXWS_SHA256SUM = d31d69e23ccf362c569d714d3ba10236e5c2735ec1b156cdba75359b3f1e9e51
-JDK_SHA256SUM = b6f726345f15b7cca18fa74507469bc6bd1ab413211f47a7eaf41e887512a80d
+JDK_SHA256SUM = 6c9615bad9788034df920514437ccfca7db44e06761cfc2b21d367f55938bcb2
 LANGTOOLS_SHA256SUM = b1ffddcca4bf3a68b95a410002235d062469362193aadf2b886e9a06092a8d35
 OPENJDK_SHA256SUM = 0c451d9f107ac425d1b1d0f283f12a268ec1ec1e6d13d266a53723896d1cb578
 
@@ -479,13 +479,45 @@
 	STATIC_CXX="false" \
 	BUILD_GCC="$(CC)" \
 	BUILD_CXX="$(CXX)" \
-	USE_SYSTEM_CUPS="true" \
+	SYSTEM_CUPS="true" \
 	CUPS_LIBS="${CUPS_LIBS}" \
 	CUPS_CFLAGS="${CUPS_CFLAGS}" \
 	STRIP_POLICY=no_strip \
 	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
 	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
-	UNLIMITED_CRYPTO="true"
+	UNLIMITED_CRYPTO="true" \
+	SYSTEM_ZLIB="${ENABLE_SYSTEM_ZLIB}" \
+	ZLIB_LIBS="${ZLIB_LIBS}" \
+	ZLIB_CFLAGS="${ZLIB_CFLAGS}" \
+	SYSTEM_LCMS="${ENABLE_SYSTEM_LCMS}" \
+	LCMS_LIBS="${LCMS2_LIBS}" \
+	LCMS_CFLAGS="${LCMS2_CFLAGS}" \
+	SYSTEM_JPEG="${ENABLE_SYSTEM_JPEG}" \
+	JPEG_LIBS="${JPEG_LIBS}" \
+	JPEG_CFLAGS="${JPEG_CFLAGS}" \
+	SYSTEM_PNG="${ENABLE_SYSTEM_PNG}" \
+	PNG_LIBS="${PNG_LIBS}" \
+	PNG_CFLAGS="${PNG_CFLAGS}" \
+	SYSTEM_GIF="${ENABLE_SYSTEM_GIF}" \
+	GIF_LIBS="${GIF_LIBS}" \
+	GIF_CFLAGS="${GIF_CFLAGS}" \
+	SYSTEM_GTK="${ENABLE_SYSTEM_GTK}" \
+	GTK_LIBS="${GTK_LIBS}" \
+	GTK_CFLAGS="${GTK_CFLAGS}" \
+	SYSTEM_GIO="${ENABLE_SYSTEM_GIO}" \
+	GIO_LIBS="${GIO_LIBS}" \
+	GIO_CFLAGS="${GIO_CFLAGS}" \
+	SYSTEM_FONTCONFIG="${ENABLE_SYSTEM_FONTCONFIG}" \
+	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
+	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}" \
+	COMPILE_AGAINST_SYSCALLS="${ENABLE_SYSCALL_COMPILATION}" \
+	SYSTEM_KRB5="${ENABLE_SYSTEM_KERBEROS}" \
+	KRB5_LIBS="${KRB5_LIBS}" \
+	KRB5_CFLAGS="${KRB5_CFLAGS}" \
+	SYSTEM_PCSC="${ENABLE_SYSTEM_PCSC}" \
+	PCSC_LIBS="${PCSC_LIBS}" \
+	PCSC_CFLAGS="${PCSC_CFLAGS}" \
+	COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}"
 
 if ENABLE_CACAO
 ICEDTEA_ENV += \
@@ -523,86 +555,6 @@
 	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 endif
 
-if USE_SYSTEM_ZLIB
-ICEDTEA_ENV += \
-	SYSTEM_ZLIB="true" \
-	ZLIB_LIBS="${ZLIB_LIBS}" \
-	ZLIB_CFLAGS="${ZLIB_CFLAGS}"
-endif
-
-if USE_SYSTEM_LCMS
-ICEDTEA_ENV += \
-	USE_SYSTEM_LCMS="true" \
-	LCMS_LIBS="${LCMS2_LIBS}" \
-	LCMS_CFLAGS="${LCMS2_CFLAGS}"
-endif
-
-if USE_SYSTEM_JPEG
-ICEDTEA_ENV += \
-	USE_SYSTEM_JPEG="true" \
-	JPEG_LIBS="${JPEG_LIBS}" \
-	JPEG_CFLAGS="${JPEG_CFLAGS}"
-endif
-
-if USE_SYSTEM_PNG
-ICEDTEA_ENV += \
-	USE_SYSTEM_PNG="true" \
-	PNG_LIBS="${PNG_LIBS}" \
-	PNG_CFLAGS="${PNG_CFLAGS}"
-endif
-
-if USE_SYSTEM_GIF
-ICEDTEA_ENV += \
-	USE_SYSTEM_GIF="true" \
-	GIF_LIBS="${GIF_LIBS}" \
-	GIF_CFLAGS="${GIF_CFLAGS}"
-endif
-
-if USE_SYSTEM_GTK
-ICEDTEA_ENV += \
-	USE_SYSTEM_GTK="true" \
-	GTK_LIBS="${GTK_LIBS}" \
-	GTK_CFLAGS="${GTK_CFLAGS}"
-endif
-
-if USE_SYSTEM_GIO
-ICEDTEA_ENV += \
-	USE_SYSTEM_GIO="true" \
-	GIO_LIBS="${GIO_LIBS}" \
-	GIO_CFLAGS="${GIO_CFLAGS}"
-endif
-
-if USE_SYSTEM_FONTCONFIG
-ICEDTEA_ENV += \
-	USE_SYSTEM_FONTCONFIG="true" \
-	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
-	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
-endif
-
-if USE_SYSCALL_COMPILATION
-ICEDTEA_ENV += \
-	COMPILE_AGAINST_SYSCALLS="true"
-endif
-
-if ENABLE_JAR_COMPRESSION
-ICEDTEA_ENV += \
-	COMPRESS_JARS="true"
-endif
-
-if USE_SYSTEM_KERBEROS
-ICEDTEA_ENV += \
-	SYSTEM_KRB5="true" \
-	KRB5_LIBS="${KRB5_LIBS}" \
-	KRB5_CFLAGS="${KRB5_CFLAGS}"
-endif
-
-if USE_SYSTEM_PCSC
-ICEDTEA_ENV += \
-	USE_SYSTEM_PCSC="true" \
-	PCSC_LIBS="${PCSC_LIBS}" \
-	PCSC_CFLAGS="${PCSC_CFLAGS}"
-endif
-
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \

--- a/NEWS	Fri Jan 31 21:39:59 2014 +0000
+++ b/NEWS	Wed Feb 05 12:19:45 2014 +0000
@@ -302,6 +302,7 @@
   - S8003853 opto: specify offset of IC load in java_to_interp stub.
   - S8005055: pass outputStream to more opto debug routines
   - S8006971 rt: Improve handling of memory ordering in taskqueue.hpp.
+  - S8019929: PPC64 (part 107): Extend ELF-decoder to support PPC64 function descriptor tables
   - Several NIO fixes for AIX to pass JCK tests
   - shared assembler: fix DelayedConstant.
   - shared: Basic non-functional fixes needed for the ppc port.
@@ -343,6 +344,7 @@
   - S8000476: Memory Leaks and uninitialized memory access in PKCS11 and other native code
   - S8001579: Cleanup warnings in security native code
   - S8007607: security native code doesn't always use malloc, realloc, and calloc correctly
+  - S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
   - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
 * Bug fixes
   - Fix implicit function declarations
@@ -355,6 +357,25 @@
   - Fix Zero following integration of PPC port
   - PR1660: Allow use of system PCSC
   - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
+  - PR1659: OpenJDK 7 returns incorrect TrueType font metrics when bold style is set
+  - PR1661: Cleanup COMPILE_AGAINST_SYSCALLS option and allow it to be set false
+  - PR1661: Cleanup COMPRESS_JARS option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_CUPS option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_FONTCONFIG option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_GIF option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_GIO option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_GTK option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_JPEG option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_LCMS option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_PCSC option and allow it to be set false
+  - PR1661: Cleanup SYSTEM_PNG option and allow it to be set false
+  - PR1664: Ensure all SYSTEM_* options are in jdk_generic_profile.sh
+  - Link against $(LIBDL) if SYSTEM_CUPS is not true
+  - Only get CFLAGS/LIBS for libpcsclite if installed
+  - Add lost #endif
+  - Add new files from 8019229
+  - Remove duplicate ElfFuncDescTable code in elfSymbolTable.cpp
+  - Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp
 * JamVM
   - JVM_NewMultiArray: element class may be an array
   - jtreg test java/lang/reflect/Array/ExceedMaxDim

--- a/acinclude.m4	Fri Jan 31 21:39:59 2014 +0000
+++ b/acinclude.m4	Wed Feb 05 12:19:45 2014 +0000
@@ -1955,8 +1955,9 @@
     fi
     AC_SUBST(LCMS2_CFLAGS)
     AC_SUBST(LCMS2_LIBS)
+    ENABLE_SYSTEM_LCMS=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_LCMS, test x"${ENABLE_SYSTEM_LCMS}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_LCMS, test x"${ENABLE_SYSTEM_LCMS}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_LCMS)
 ])
 
@@ -1981,8 +1982,9 @@
     fi
     AC_SUBST(ZLIB_CFLAGS)
     AC_SUBST(ZLIB_LIBS)
+    ENABLE_SYSTEM_ZLIB=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_ZLIB, test x"${ENABLE_SYSTEM_ZLIB}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_ZLIB, test x"${ENABLE_SYSTEM_ZLIB}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_ZLIB)
 ])
 
@@ -2006,8 +2008,9 @@
         , [AC_MSG_ERROR([Could not find JPEG header; install JPEG or build with --disable-system-jpeg to use the in-tree copy.])])
     JPEG_LIBS="-ljpeg"
     AC_SUBST(JPEG_LIBS)
+    ENABLE_SYSTEM_JPEG=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_JPEG, test x"${ENABLE_SYSTEM_JPEG}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_JPEG, test x"${ENABLE_SYSTEM_JPEG}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_JPEG)
 ])
 
@@ -2032,8 +2035,9 @@
     fi
     AC_SUBST(PNG_CFLAGS)
     AC_SUBST(PNG_LIBS)
+    ENABLE_SYSTEM_PNG=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_PNG, test x"${ENABLE_SYSTEM_PNG}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_PNG, test x"${ENABLE_SYSTEM_PNG}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_PNG)
 ])
 
@@ -2057,8 +2061,9 @@
         , [AC_MSG_ERROR([Could not find GIF header; install GIF or build with --disable-system-gif to use the in-tree copy.])])
     GIF_LIBS="-lgif"
     AC_SUBST(GIF_LIBS)
+    ENABLE_SYSTEM_GIF=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_GIF, test x"${ENABLE_SYSTEM_GIF}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_GIF, test x"${ENABLE_SYSTEM_GIF}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_GIF)
 ])
 
@@ -2083,8 +2088,9 @@
         , [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)
+    ENABLE_SYSTEM_KERBEROS=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_KERBEROS)
 ])
 
@@ -2109,8 +2115,9 @@
     fi
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)
+    ENABLE_SYSTEM_GTK=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_GTK, test x"${ENABLE_SYSTEM_GTK}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_GTK, test x"${ENABLE_SYSTEM_GTK}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_GTK)
 ])
 
@@ -2135,8 +2142,9 @@
     fi
     AC_SUBST(GIO_CFLAGS)
     AC_SUBST(GIO_LIBS)
+    ENABLE_SYSTEM_GIO=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_GIO, test x"${ENABLE_SYSTEM_GIO}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_GIO, test x"${ENABLE_SYSTEM_GIO}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_GIO)
 ])
 
@@ -2161,8 +2169,9 @@
     fi
     AC_SUBST(FONTCONFIG_CFLAGS)
     AC_SUBST(FONTCONFIG_LIBS)
+    ENABLE_SYSTEM_FONTCONFIG=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_FONTCONFIG, test x"${ENABLE_SYSTEM_FONTCONFIG}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_FONTCONFIG, test x"${ENABLE_SYSTEM_FONTCONFIG}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_FONTCONFIG)
 ])
 
@@ -2195,8 +2204,9 @@
       [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
     AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
       , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])])
+    ENABLE_SYSCALL_COMPILATION=true
   fi
-  AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes")
+  AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xtrue")
   AC_SUBST(ENABLE_SYSCALL_COMPILATION)
 ])
 
@@ -2221,8 +2231,9 @@
     fi
     AC_SUBST(PCSC_CFLAGS)
     AC_SUBST(PCSC_LIBS)
+    ENABLE_SYSTEM_PCSC=true
   fi
-  AM_CONDITIONAL(USE_SYSTEM_PCSC, test x"${ENABLE_SYSTEM_PCSC}" = "xyes")
+  AM_CONDITIONAL(USE_SYSTEM_PCSC, test x"${ENABLE_SYSTEM_PCSC}" = "xtrue")
   AC_SUBST(ENABLE_SYSTEM_PCSC)
 ])
 
@@ -2467,18 +2478,19 @@
   [
     case "${enableval}" in
       no)
-        enable_jar_compression=no
+        ENABLE_JAR_COMPRESSION=false
         ;;
       *)
-        enable_jar_compression=yes
+        ENABLE_JAR_COMPRESSION=true
         ;;
     esac
   ],
   [
-    enable_jar_compression=yes
+    ENABLE_JAR_COMPRESSION=true
   ])
-  AC_MSG_RESULT([$enable_jar_compression])
-  AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
+  AC_MSG_RESULT([$ENABLE_JAR_COMPRESSION])
+  AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xtrue")
+  AC_SUBST(ENABLE_JAR_COMPRESSION)
 ])
 
 dnl Generic macro to check for a Java constructor

--- a/hotspot.map	Fri Jan 31 21:39:59 2014 +0000
+++ b/hotspot.map	Wed Feb 05 12:19:45 2014 +0000
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 3e4a750b116a dafaa54797f52ac9632bc090723ddea68003384673e7ca03d5ad26026203f209
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot bc178be7e9d6 6811d400c0922adc78a7859f1b3e208889f0b4e3f7c4772379070ae7f11516f1