--- a/ChangeLog	Thu Jan 30 15:09:47 2014 +0000
+++ b/ChangeLog	Fri Jan 31 21:39:59 2014 +0000
@@ -1,3 +1,41 @@
+2014-01-31  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* patches/boot/jaxp-dependency.patch:
+	Removed as provided by PPC port integration.
+	* patches/ppc/8026703-xsl_include.patch:
+	Removed following PPC port integration.
+	* INSTALL: Updated.
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to current HEAD.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Drop PPC-specific patch.
+	(ICEDTEA_BOOT_PATCHES): Drop jaxp-dependency.patch
+	(ICEDTEA_ENV): Add system libpcsc options.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Use host_cpu and don't enable
+	on ppc64 any more.
+	(IT_CHECK_FOR_PCSC): System libpcsclite support macro.
+	* configure.ac:
+	Call IT_CHECK_FOR_PCSC.
+	* hotspot.map: Remove ppc. Update default to tip.
+	* patches/boot/ant-javac.patch,
+	* patches/boot/jaxws-langtools-dependency.patch:
+	Regenerated.
+	* remove-intree-libraries.sh.in:
+	Remove libpcsclite headers when building with system
+	version.
+
 2014-01-30  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add 2.4.5 release notes.

--- a/INSTALL	Thu Jan 30 15:09:47 2014 +0000
+++ b/INSTALL	Fri Jan 31 21:39:59 2014 +0000
@@ -10,9 +10,8 @@
 A bootstrap JDK, either:
   - GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) for --enable-bootstrap mode (the default)
   - IcedTea6 or IcedTea7 for --disable-bootstrap mode
-Eclipse Java Compiler (ecj)
 CUPS
-libX11 (libXp, libXtst, libXi, libXt)
+libX11 (libXp, libXtst, libXi, libXt, libXinerama)
 Freetype2
 patch
 sed
@@ -20,18 +19,19 @@
 sha256sum (from coreutils)
 wget
 alsa
-xalan
-xerces
-glib2-devel 
-gtk2-devel
+xsltproc (for bootstrapping)
 ant >= 1.6.5 with the regexp task from ant-nodeps
-libXinerama-devel
-giflib-devel
-libpng-devel
-libjpeg-devel >= 6b
-zlib-devel
+glib2-devel (for --enable-system-gio)
+gtk2-devel (for --enable-system-gtk)
+giflib-devel (for --enable-system-gif)
+libpng-devel (for --enable-system-png)
+libjpeg-devel >= 6b (for --enable-system-jpeg)
+zlib-devel (for --enable-system-zlib)
+fontconfig (for --enable-system-fontconfig)
+libc6-dev & libattr-devel/libattr1-dev (for --enable-compile-against-syscalls)
+libpcsclite (for --enable-system-pcsc)
 rhino (can be disabled using --without-rhino)
-libffi (for --enable-zero or on archs other than x86/x86_64/sparc)
+libffi (for --enable-zero or on archs other than x86/x86_64/sparc/ppc64)
 pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
 LLVM 2.5 or later (for --enable-shark)
 systemtap-sdl-devel >= 0.9.5 (Java method tracing requires systemtap >= 0.9.9)
@@ -106,6 +106,8 @@
   GIO instead of trying to dynamically open it at runtime.
 * --enable-system-fontconfig: Build and link against the system installation of
   fontconfig instead of trying to dynamically open it at runtime.
+* --enable-system-pcsc: Build and link against the system installation of
+  libpcsclite instead of trying to dynamically open it at runtime.
 * --enable-compile-against-syscalls: Check for syscalls at compile-time not runtime.
 * --with-gcj: Compile ecj to native code with gcj prior to building.
 * --with-parallel-jobs: Run the specified number of parallel jobs when

--- a/Makefile.am	Thu Jan 30 15:09:47 2014 +0000
+++ b/Makefile.am	Fri Jan 31 21:39:59 2014 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b03
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 1d9647b1ff91
-JAXP_CHANGESET = 84cee724e1a8
-JAXWS_CHANGESET = a840edf95760
-JDK_CHANGESET = 3cc793e4b177
-LANGTOOLS_CHANGESET = c1b7eb1ea511
-OPENJDK_CHANGESET = 18745a6e5f6d
+CORBA_CHANGESET = 47343904e95d
+JAXP_CHANGESET = 74093b75ddd4
+JAXWS_CHANGESET = 3f7212cae6eb
+JDK_CHANGESET = 62781eb5cd06
+LANGTOOLS_CHANGESET = 0d89cc5766d7
+OPENJDK_CHANGESET = ba9872fc05cc
 
-CORBA_SHA256SUM = 8973eee61b625bf0fa43a369f1932385252a19154cf3e1870dd0cab34edfadf5
-JAXP_SHA256SUM = 44cf8572051bdae93f18a0a860e3f5b01a75a876f7fb5b0d97d5e96d7b1778ae
-JAXWS_SHA256SUM = 328d8d964143d97a875dab4573071231b7d28286c2656242b39221358327965a
-JDK_SHA256SUM = 229e9e20f8fd4d62be34ff20653f49b6defa021ff8e5c9841fb1fc2b0199d23b
-LANGTOOLS_SHA256SUM = 7e3e82ef3fae40e7628f088dae8e3b51ab426419f3e548782fd43d6961c531d7
-OPENJDK_SHA256SUM = 834ed675c9382c95a639d1ec0c7a712ce2d9e83dbc0d2fa74fe686527f6d2582
+CORBA_SHA256SUM = 78298de3f81eab8c6875f802d76789ad615920a4278f5665eea79045ee0da638
+JAXP_SHA256SUM = 5fc990186c57ed95ad3f9fb4783e874085f1fc624afb81899354c0df04cad73e
+JAXWS_SHA256SUM = d31d69e23ccf362c569d714d3ba10236e5c2735ec1b156cdba75359b3f1e9e51
+JDK_SHA256SUM = b6f726345f15b7cca18fa74507469bc6bd1ab413211f47a7eaf41e887512a80d
+LANGTOOLS_SHA256SUM = b1ffddcca4bf3a68b95a410002235d062469362193aadf2b886e9a06092a8d35
+OPENJDK_SHA256SUM = 0c451d9f107ac425d1b1d0f283f12a268ec1ec1e6d13d266a53723896d1cb578
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -262,11 +262,6 @@
 
 # Conditional patches
 
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
-	patches/ppc/8026703-xsl_include.patch
-endif
-
 if WITH_RHINO
 ICEDTEA_PATCHES += \
 	patches/rhino.patch
@@ -328,7 +323,6 @@
 	patches/boot/tobin.patch \
 	patches/boot/tools.jar.patch \
 	patches/boot/jopt.patch \
-	patches/boot/jaxp-dependency.patch \
 	patches/boot/genstubs-nofork.patch \
 	patches/boot/getannotation-cast.patch \
 	patches/boot/break-processbuilder-dependency.patch \
@@ -602,6 +596,13 @@
 	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	Thu Jan 30 15:09:47 2014 +0000
+++ b/NEWS	Fri Jan 31 21:39:59 2014 +0000
@@ -119,6 +119,231 @@
   - S8030061: new hotspot build - hs24.60-b05
   - S8030070: Test java/io/File/CheckPermission.java fails due to unfinished recursion (java.lang.StackOverflowError) when JIT'ed code (-client,-server) is running
   - S8031787: Remove fix JDK-8026887 from 7u60
+* PPC & AIX port
+  - Add AIX-specific build instructions to README-ppc.html
+  - Added AIX as testing platform for more jtreg tests written in shell-script
+  - Added AIX specific build defs file
+  - Added AIX to list of operating systems to include in static jli build
+  - Added AIX version of classlist
+  - Added enumIPv4Interfaces, enumIPv6Interfaces and getMacAddress implementation for AIX.
+  - Added initial AIX version of UNIXProcess.java  copied from existing Solaris one
+  - Added missing B_FALSE and B_TRUE definitions for AIX when building ec component.
+  - Added missing Dlinfo structure for SAP version of hprof_md.c
+  - Added section about problems with pre-installed ANT and our bootstrap JDK on Linux and how to solve them
+  - Added UnixOperatingSystem.getTotalPhysicalMemorySize and getFreePhysicalMemorySize implementation for AIX by facilitating perfstat APIs.
+  - add "<jrepath>/lib/<arch>/jli/" to the runtime library path in the java launcher for AIX because AIX ld doesn't support $ORIGIN and libjli.so isn't found otherwise
+  - Add libmawt linking for libfontmanager on AIX platform
+  - Add memory limit requirements (ulimit) for AIX to README-ppc.html
+  - Addon for merge 5851:b717d0d99407 - add missing file AixNativeDispatcher.c
+  - Add OS and Compiler information to the VM version string on AIX
+  - Add section about the necessity of 'GNU tar' during the build process
+  - Add some AIX-specific files which were missing from changeset 5101:a06818b39f7c
+  - adlc: do safe call to constant_offset() in debug coding
+  - aix: add macros AIX_ONLY and NOT_AIX
+  - aix: AIX platform files as required to start up the interpreter.
+  - AIX changes to build the complete OpenJDK on a vanilla AIX system
+  - aix: fix disclaiming memory.
+  - Aix port: add file globalDefinitions_xlc.hpp.
+  - aix: remove warnings about memory allocation
+  - asm: fix DelayedConstant
+  - Basic AIX adaption. With this change the VM can successfully run 'HelloWorld' on AIX
+  - Build "fdlibm" without optimizations and with -qfloat=nomaf on AIX
+  - C argument in register AND stack slot.
+  - Check consistency of the PPC-specific flag 'UseSIGTRAP' with 'ImplicitRangeChecks' and 'ImplicitNullChecks'
+  - C-interpreter: add biased locking support
+  - C-interpreter: basic fixes
+  - C-interpreter: Fix for OSR.
+  - C-interpreter: implement bytecode profiling.
+  - C-interpreter: implement G1 support
+  - C-interpreter: implement support for compressed Oops.
+  - C++ interpreter: implement support for early return
+  - C-interpreter: improve memory ordering implementation.
+  - C-interpreter: memory ordering as required for platforms with weak memory ordering (PPC)
+  - C-interpreter: some diffs I missed before
+  - C-interpreter: support for method handles.
+  - Corrected incorrect use of ps -e on AIX
+  - Disable sctp support for now on AIX platform
+  - Disable use of sys/swap.h when building UnixOperatingSystem_md.c on AIX
+  - dlopen() on AIX does not support RTLD_NOLOAD, so use RTLD_LZAY to workaround.
+  - Enable AWT/Swing on AIX
+  - Enable awt to build on AIX
+  - Enable building jaas library on AIX platform
+  - Enabled SoundDefs to build on AIX
+  - Enable jdi script based tests to run on AIX.  (fixed issue with uname -s result not being understood by tests)
+  - Enable mannual and Javadoc on AIX platform
+  - Enable medialib to build on AIX
+  - Enable the build of HotSpot 'CORE' targets from the top-level makefile by setting CORE_BUILD=true.
+  - Enable Tls operations in jdwp socket transport module for AIX platform
+  - Expand conditional include in several more source files to not include
+  - Expanded check for which wait.h to use. Changed so on AIX sys/wait.h is used.
+  - Expanded platform choice logic to include AIX when deciding to create the MB macro.
+  - Explicitly defined ARCH_DATA_MODEL for AIX to be 64
+  - Export 'USE_PTHREADS' on Linux trough CPPFLAGS to fix the build because java_md_solinux.c now only relies on 'USE_PTHREADS' beeing defined.
+  - Extended BSD remapping of special 64 bit directory function names to generic versions to now apply to AIX.
+  - Extended decision to use pthreads in java_md_solinux to include specific use of USE_PTHREADS define
+  - Extended existing ifdef to cover AIX so that npt does not include link.h
+  - Extended find zone info functionaility to compile on AIX
+  - Extend existing Solaris behaviour to cover AIX and treat empty TZ envvar same as no TZ envvar
+  - Extend Load and Store nodes to know about memory ordering.
+  - fastdebug build: images step fails building installer binaries
+  - Fix aix build error.
+  - Fix broken AIX build
+  - Fix build on Linux with 64kb default page size
+  - Fix build with gcc 4.7
+  - Fix calls to the LoadLNode constructor with the Load semantics argument in the wrong position.
+  - Fixed from 8 port moved to 7.
+  - Fixed JTreg failure from java/util/ResourceBundle/Control/ExpirationTest.sh
+  - Fixed memory handling/bookkeeping of mmaped memory on AIX
+  - Fixed sun/nio/ch implementation on AIX
+  - Fix IA64 preprocessor conditionals on AIX!!!
+  - Fix iconv encoding problem on AIX < 7.1 in SplashConvertStringAlloc
+  - Fix JTreg failure from java/nio/charset/Charset/NIOCharsetAvailabilityTest.java
+  - Fix JTreg failure from java/nio/charset/spi/basic.sh
+  - Fix native multicast sockets implementation on AIX
+  - Fix native stack traces in hs_err files on Linux/PPC64
+  - Fix setting of SO_REUSEADDR socket option on AIX (where the socket option is called SO_REUSEPORT)
+  - Fix small mistake introduced by the port which breaks the Windows build
+  - Fix typo in change 'Fix native stack traces in hs_err files..'
+  - Fix usage of feature detection on ppc for fsqrt instruction. Also guarantee no wrong instructions are used.
+  - Fix -Xcheck:jni on AIX
+  - Fix Xrender backend on  64-bit Big-endian architectures
+  - Further format fixes after removing ppc_ prefixes.
+  - G1: Fix problem with nonvolatile field
+  - G1: Port C-interpreter to support G1.
+  - gethostbyname_r and gethostbyaddr_r have got different syntax on AIX, this patch added the support of host entry getting.
+  - Implement AttachListener for AIX
+  - Implemented a no-op version of getPlatformTimeZoneID() for AIX
+  - Implemented os::thread_cpu_time for AIX
+  - Implement printing CodeComments in stubs.
+  - Implement printing CodeComments in stubs: fix product build.
+  - Implement support for the "System V Print Subsystem" on AIX
+  - Implement workaround for I/O cancellation on AIX (by using the Linux wrappers from "linux_close.c")
+  - Improve adlc usability.
+  - Improve handling of memory ordering in taskqueue.hpp.
+  - Include dlfcn.h since link.h is not available on AIX
+  - Include files needed for PPC C2 build.
+  - Initial AIX build config files primarily based on changes from SAP.  This is to preserve any Hotspot speciific settings
+  - Initial Aix-Port checkin.
+  - Initial PPC-Port checkin
+  - link.h not required (and does not exist) on AIX.  Expanded conditional include to cover AIX
+  - linux: extend signal handler to catch SIGTRAP on ppc.
+  - Make hsdis build and work on Linux/PPC64
+  - make: Implement aix ppc64 build.
+  - make: Implement linux ppc64 support in makefiles.
+  - Make nio module to build on AIX
+  - make: Reenable CORE build
+  - Memory ordering as required for platforms with weak memory ordering (PPC)
+  - Memory ordering: introduce functions to specify platform properties.
+  - method handles: some smaller fixes and extensions for ppc
+  - New HS24 JSR292 implementation for PPC64
+  - opto: adapt assertion in postaloc.cpp for ppc.
+  - opto: Basic fixes for the ppc C2 port
+  - opto: Do not relocate in scratch emit.
+  - opto: explicit specification of rematerialization in ad file.
+  - opto: Extend adlc to generate fields into nodes.
+  - opto: Extend ImplicitNullCheck optimizations.
+  - opto: Extend Load and Store nodes to know about memory ordering.
+  - Opto: extend MachConstantNode functionality to ins_encode statements.
+  - opto: hook to postprocess matcher output platform dependent.
+  - opto: initialize _node_regs_max_index
+  - Opto: introduce phase lateExpand to expand nodes after register allocation.
+  - opto: issue more memory barriers as neede on PPC.
+  - opto: Move static _in_dump_cnt to Compile object.
+  - opto: Pass output stream to more debug routines.
+  - opto/ppc: trap based null and range checks
+  - opto / regalloc: Fix problem with rematerialization
+  - opto,rt: Support for C calling conventions that require 64-bit ints.
+  - opto: specify offset of IC load in java_to_interp stub.
+  - Opto: Support for constants in stub code.
+  - opto: support for constants on ppc
+  - opto: switch off OptimizeFill on PPC as it causes errors.
+  - opto: Trampoline relocations
+  - opto: trap based null and range checks
+  - Part assembler and macroassembler into two files.
+  - posix: fix build errors on aix 7.1 and sparc
+  - posix: Implement methods giving infos about signals.
+  - ppc/aix: Adaptions needed for recent update.
+  - ppc/aix: Fixes for recent update
+  - PPC assembler and register definitions.
+  - PPC assembly needed to start up the interpreter.
+  - ppc: compiler fixes & enable OSR
+  - PPC: Continue C2 port: now jvm98 runs with compiler
+  - ppc: enable better implicit null check recognition with cOops
+  - ppc: fix cOops problem on aix
+  - ppc: fix gcc 4.3.4 build
+  - ppc: Fix issue in trap based null check optimization
+  - ppc: Fix register usage in GetAndAdd & friends.
+  - ppc: fix safepoint node.
+  - ppc: fix trap based range checks.
+  - ppc: Implement card mark emitter for concurrentMarkSweep.
+  - PPC: Initial C2 compiler port.
+  - ppc: Initial C2 compiler port, ppc files
+  - ppc: port method handles support (hs21-hs23 version)
+  - ppc: PPC platform files as required to start up the interpreter.
+  - ppc: Relax load aquire and various minor changes
+  - ppc: SIGTRAP based checks
+  - PPC specific C2 flags: add macro PD_C2_FLAGS to global flag definitions.
+  - PPC specific flags: add macro PD_FLAGS to global flag definitions.
+  - ppc: support for g1, cOops
+  - Propagate HOTSPOT_BUILD_JOBS and PARALLEL_COMPILE_JOBS from the top-level make to the corresponding sub-makes.
+  - Recent changes to ppc files, especially to ppc.ad file.
+  - Recent improvements by SAP.
+  - Re-enable the 'gamma' test at the end of the HotSpot build, but only for HotSpot based bootstrap JDKs.
+  - Removed unused DL_info declaration in java_md_solinux.c that caused AIX compiler failure
+  - Remove ppc_ prefixes in ppc files.
+  - Remove some unnecessary diffs to Oracle coding.
+  - rt: add fence to taskqueue to fix probelms showing in torture tests
+  - rt: C argument in register AND stack slot.
+  - rt: extend ELF-decoder to ppc function descriptor tables
+  - rt: Use stubs to implement safefetch.
+  - S7177701: error: Filling jar message during javax/imageio/metadata/IIOMetadataFormatImpl compilation
+  - S8003850 opto: introduce phase lateExpand to expand nodes after register allocation.
+  - S8003850: add support for constants in stub code
+  - 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.
+  - Several NIO fixes for AIX to pass JCK tests
+  - shared assembler: fix DelayedConstant.
+  - shared: Basic non-functional fixes needed for the ppc port.
+  - shared: Fix IA64 preprocessor conditionals on AIX.
+  - shared: introduce functions to specify memory ordering properties of platforms.
+  - shared: Make adapter_code_size a function.
+  - shared: Make hotspot build with gcc 4.7.2 and newer
+  - shared: Make hsdis build and work on Linux/PPC64
+  - shared: Memory ordering as required for platforms with weak memory ordering (PPC)
+  - shared: ordering of Independent Reads of Independent Writes
+  - Some basic AIX changes to let the VM bootstrap itself and run JVM98.
+  - Support for C calling conventions that require 64-bit ints.
+  - Switched LD path setup for freetype version check so AIX can be covered by the 'everything else' part
+  - Switch off Compressed Oops on AIX until we fix them
+  - Temporarily disable 'EnableInvokeDynamic' while working on the new HS24 indy implementation
+  - Temporarily switch off 'TrapBasedRangeChecks'
+  - Trampoline relocations.
+  - Trampoline relocations.  Add some more functionality.
+  - Turned off ImplicitNullChecks on AIX by default because it requires UseSIGTRAP which isn't currently implemented on AIX
+  - Updated conditional handling for AIX when BLOCK_SOURCE enabled. Resolved Undefined symbol: .isSourceFilterSupported
+  - Updated Defs-versions to understand about using xlc compiler on AIX
+  - Updated genUnixConstants.c to compile on AIX.  Made location of fcntl.h file platform specific and added a default value for O_NOFOLLOW as not supported on AIX
+  - Updated hprof demo to build on AIX.  Added SAP changes to fake out DLinfo etc
+  - Updated hprof_md.c to include AIX as platform without hires timer
+  - Updated location of bootstrap JDKs
+  - Updated Platform.gmk to set PLATFORM=aix when uname is AIX
+  - Updated README-ppc.html to reflect the current project status
+  - Updated README to reflect the current status of the project (mainly the availability of a mixed-mode VM on Linux and AIX)
+  - Updated test scripts to understand AIX os environment
+  - Updated using pthreads in java_md_solinux.c to just rely on USE_PTHREADS. Removed the superflous __linux__ as  USE_PTHREADS is already explictly turned on for linux builds
+  - Use fork() to provide FORK() as Linux
+  - Use LIBPATH in the launcher on AIX insted of LD_LIBRARY_PATH
+  - Use macosx's BsdVirtualMachine implementation to provide tools/attach on AIX platform.
+  - Use stubs to implement safefetch.
+  - Use the solaris' approach of doing IsXRenderAvailable check for AIX
+* Backports
+  - S7103549: Remove dependencies on libjava and libjvm from security libraries
+  - S8000204: Memory leak in com/sun/security/auth/module/Unix.c
+  - 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
+  - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
 * Bug fixes
   - Fix implicit function declarations
   - PR1617: Include defs.make in vm.make so zeroshark.make is included
@@ -126,6 +351,10 @@
   - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
   - Remove binary files and unlicensed generated files
   - PR1655: Don't add IcedTea-Web jars to bootclasspath
+  - Enable CC_INTERP on ppc64
+  - 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)
 * JamVM
   - JVM_NewMultiArray: element class may be an array
   - jtreg test java/lang/reflect/Array/ExceedMaxDim

--- a/acinclude.m4	Thu Jan 30 15:09:47 2014 +0000
+++ b/acinclude.m4	Fri Jan 31 21:39:59 2014 +0000
@@ -682,10 +682,11 @@
     if test "x${use_shark}" = "xyes"; then
       use_zero=yes;
     else
-      case "${host}" in
-        i?86-*-*) ;;
-        sparc*-*-*) ;;
-        x86_64-*-*) ;;
+      case "${host_cpu}" in
+        i?86) ;;
+        sparc) ;;
+        x86_64) ;;
+	ppc64) ;;
         *)
           if test "x${ENABLE_CACAO}" != xno || \
 	     test "x${ENABLE_JAMVM}" = xyes; then
@@ -2199,6 +2200,32 @@
   AC_SUBST(ENABLE_SYSCALL_COMPILATION)
 ])
 
+AC_DEFUN_ONCE([IT_CHECK_FOR_PCSC],
+[
+  AC_MSG_CHECKING([whether to use the system libpcsclite install])
+  AC_ARG_ENABLE([system-pcsc],
+	      [AS_HELP_STRING(--enable-system-pcsc,use the system PCSC [[default=yes]])],
+  [
+    ENABLE_SYSTEM_PCSC="${enableval}"
+  ],
+  [
+    ENABLE_SYSTEM_PCSC="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_SYSTEM_PCSC})
+  if test x"${ENABLE_SYSTEM_PCSC}" = "xyes"; then
+    dnl Check for PCSC headers and libraries.
+    PKG_CHECK_MODULES(PCSC, libpcsclite,[LIBPCSC_FOUND=yes],[LIBPCSC_FOUND=no])
+    if test "x${LIBPCSC_FOUND}" = xno
+    then
+      AC_MSG_ERROR([Could not find libpcsc; install libpcsc or build with --disable-system-pcsc to use dynamic loading.])
+    fi
+    AC_SUBST(PCSC_CFLAGS)
+    AC_SUBST(PCSC_LIBS)
+  fi
+  AM_CONDITIONAL(USE_SYSTEM_PCSC, test x"${ENABLE_SYSTEM_PCSC}" = "xyes")
+  AC_SUBST(ENABLE_SYSTEM_PCSC)
+])
+
 AC_DEFUN([IT_ENABLE_JAMVM],
 [
   AC_MSG_CHECKING(whether to use JamVM as VM)

--- a/configure.ac	Thu Jan 30 15:09:47 2014 +0000
+++ b/configure.ac	Fri Jan 31 21:39:59 2014 +0000
@@ -213,6 +213,7 @@
 IT_CHECK_FOR_FONTCONFIG
 IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
+IT_CHECK_FOR_PCSC
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
 dnl Check for Xproto headers and libraries.

--- a/hotspot.map	Thu Jan 30 15:09:47 2014 +0000
+++ b/hotspot.map	Fri Jan 31 21:39:59 2014 +0000
@@ -1,3 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 7d60cc48fa88 8ebc6c2fd55f530b8fdac85be4f5fc60dc2af1c45ecd8abae29696de7e9a8c73
-ppc http://hg.openjdk.java.net/ppc-aix-port/jdk7u/hotspot 3cc52fb61873 ca8ddf13a1195688835cb4f6941aa9ac32070e05b5856a906a8fb2e3a5f81ac9
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 3e4a750b116a dafaa54797f52ac9632bc090723ddea68003384673e7ca03d5ad26026203f209

--- a/patches/boot/ant-javac.patch	Thu Jan 30 15:09:47 2014 +0000
+++ b/patches/boot/ant-javac.patch	Fri Jan 31 21:39:59 2014 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml	2012-02-21 23:55:29.000000000 +0000
-+++ openjdk-boot/jaxp/build.xml	2012-03-18 22:26:49.382089457 +0000
+--- openjdk-boot.orig/jaxp/build.xml	2014-01-30 19:01:54.000000000 +0000
++++ openjdk-boot/jaxp/build.xml	2014-01-31 19:55:52.521904128 +0000
 @@ -123,7 +123,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -12,15 +12,15 @@
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
          </javac>
 diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2012-02-15 17:08:44.000000000 +0000
-+++ openjdk-boot/jaxws/build.xml	2012-03-18 22:26:49.382089457 +0000
-@@ -123,7 +123,8 @@
+--- openjdk-boot.orig/jaxws/build.xml	2014-01-30 19:01:55.000000000 +0000
++++ openjdk-boot/jaxws/build.xml	2014-01-31 19:56:46.394702156 +0000
+@@ -150,7 +150,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
  	     debug="${javac.debug}"
 -             target="${javac.target}">
 +             target="${javac.target}"
 +             executable="${jdk.home}/bin/javac">
-             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}:${jaxp.classes.dir}:${build.classes.dir}"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>

--- a/patches/boot/jaxp-dependency.patch	Thu Jan 30 15:09:47 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
---- openjdk-boot.orig/jaxws/build.properties	2010-07-29 21:54:11.000000000 +0100
-+++ openjdk-boot/jaxws/build.properties	2010-09-01 21:25:29.587888259 +0100
-@@ -62,6 +62,9 @@
- build.dir=${output.dir}/build
- build.classes.dir=${build.dir}/classes
- 
-+# JAXP built files
-+jaxp.classes.dir=${output.dir}/../jaxp/build/classes
-+
- # Distributed results
- dist.dir=${output.dir}/dist
- dist.lib.dir=${dist.dir}/lib
-diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2010-09-01 21:00:02.000000000 +0100
-+++ openjdk-boot/jaxws/build.xml	2010-09-01 21:25:29.595887577 +0100
-@@ -124,7 +124,7 @@
-         <mkdir dir="${build.classes.dir}"/>
-         <javac 
- 	     includeAntRuntime="false" 
--	     classpath="${build.classes.dir}:${tools.jar}"
-+	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${tools.jar}"
- 	     fork="true"
-              destdir="${build.classes.dir}"
-              memoryInitialSize="${javac.memoryInitialSize}"

--- a/patches/boot/jaxws-langtools-dependency.patch	Thu Jan 30 15:09:47 2014 +0000
+++ b/patches/boot/jaxws-langtools-dependency.patch	Fri Jan 31 21:39:59 2014 +0000
@@ -1,7 +1,7 @@
 diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
---- openjdk-boot.orig/jaxws/build.properties	2011-03-08 18:42:23.703875234 +0000
-+++ openjdk-boot/jaxws/build.properties	2011-03-08 18:40:33.955159212 +0000
-@@ -32,7 +32,8 @@
+--- openjdk-boot.orig/jaxws/build.properties	2014-01-30 19:01:55.000000000 +0000
++++ openjdk-boot/jaxws/build.properties	2014-01-31 20:04:24.425553307 +0000
+@@ -28,7 +28,8 @@
  # other tools, and product versions of all the tools.
  # Override this path as needed, either on the command line or in 
  # one of the standard user build.properties files (see build.xml)
@@ -11,7 +11,7 @@
  
  # The tools.jar is needed in the classpath to compile these sources
  jdk.home=${java.home}/..
-@@ -93,8 +94,9 @@
+@@ -77,8 +78,9 @@
    os.name=${os.name}${line.separator}\
    os.arch=${os.arch}${line.separator}\
    os.version=${os.version}${line.separator}\
@@ -23,21 +23,21 @@
    javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\
    javac.source=${javac.source}${line.separator}\
 diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2011-03-08 18:43:11.778436442 +0000
-+++ openjdk-boot/jaxws/build.xml	2011-03-08 18:40:29.639288336 +0000
-@@ -124,7 +124,7 @@
-         <mkdir dir="${build.classes.dir}"/>
-         <javac 
- 	     includeAntRuntime="false" 
+--- openjdk-boot.orig/jaxws/build.xml	2014-01-31 20:03:12.768449571 +0000
++++ openjdk-boot/jaxws/build.xml	2014-01-31 20:04:40.337798308 +0000
+@@ -143,7 +143,7 @@
+ 	-->
+         <javac
+ 	     includeAntRuntime="false"
 -	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${tools.jar}"
 +	     classpath="${jaxp.classes.dir}:${build.classes.dir}:${langtools.jar}"
  	     fork="true"
               destdir="${build.classes.dir}"
               memoryInitialSize="${javac.memoryInitialSize}"
 diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile	2011-03-08 18:41:00.178374622 +0000
-+++ openjdk-boot/jaxws/make/Makefile	2011-03-08 18:40:14.167751211 +0000
-@@ -120,7 +120,7 @@
+--- openjdk-boot.orig/jaxws/make/Makefile	2014-01-30 19:01:55.000000000 +0000
++++ openjdk-boot/jaxws/make/Makefile	2014-01-31 20:04:24.429553368 +0000
+@@ -103,7 +103,7 @@
      ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
      ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
    endif

--- a/patches/ppc/8026703-xsl_include.patch	Thu Jan 30 15:09:47 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User simonis
-# Date 1381928799 -7200
-#      Wed Oct 16 15:06:39 2013 +0200
-# Node ID 042cf42c72bd7fb3e5b50dd88d908985926f5284
-# Parent  7fe6ef09d2424c8f92244fa61393fa64f555ebd7
-8026703: Wrongly placed <xsl:import> element in Event-Based JVM Tracing .xsl files
-Reviewed-by: sla, kamg
-
-diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceEventClasses.xsl
---- openjdk/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Oct 16 09:20:23 2013 +0200
-+++ openjdk/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Oct 16 15:06:39 2013 +0200
-@@ -23,8 +23,8 @@
- -->
- 
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-+<xsl:import href="xsl_util.xsl"/>
- <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
--<xsl:import href="xsl_util.xsl"/>
- 
- <xsl:template match="/">
-   <xsl:call-template name="file-header"/>
-diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceEventIds.xsl
---- openjdk/hotspot/src/share/vm/trace/traceEventIds.xsl	Wed Oct 16 09:20:23 2013 +0200
-+++ openjdk/hotspot/src/share/vm/trace/traceEventIds.xsl	Wed Oct 16 15:06:39 2013 +0200
-@@ -23,8 +23,8 @@
- -->
- 
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-+<xsl:import href="xsl_util.xsl"/>
- <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
--<xsl:import href="xsl_util.xsl"/>
- 
- <xsl:template match="/">
-   <xsl:call-template name="file-header"/>
-diff -r 7fe6ef09d242 -r 042cf42c72bd src/share/vm/trace/traceTypes.xsl
---- openjdk/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Oct 16 09:20:23 2013 +0200
-+++ openjdk/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Oct 16 15:06:39 2013 +0200
-@@ -23,8 +23,8 @@
- -->
- 
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-+<xsl:import href="xsl_util.xsl"/>
- <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
--<xsl:import href="xsl_util.xsl"/>
- 
- <xsl:template match="/">
-   <xsl:call-template name="file-header"/>

--- a/remove-intree-libraries.sh.in	Thu Jan 30 15:09:47 2014 +0000
+++ b/remove-intree-libraries.sh.in	Fri Jan 31 21:39:59 2014 +0000
@@ -6,6 +6,7 @@
 GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
 PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
 LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
+PCSC_SRC=openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
 
 if test "x@ENABLE_SYSTEM_ZLIB@" = "xyes"; then
   echo "Removing zlib"
@@ -58,3 +59,7 @@
   rm -vf ${LCMS_SRC}/lcms2_plugin.h
 fi
 
+if test "x@ENABLE_SYSTEM_PCSC@" = "xyes"; then
+  echo "Removing libpcsc headers"
+  rm -rvf ${PCSC_SRC}
+fi